From: Mike Bayer Date: Sat, 15 Oct 2011 15:24:43 +0000 (-0400) Subject: fix typos [ticket:2294] [ticket:2300]. these are both due to reworkings of 0.6 docs... X-Git-Tag: rel_0_7_3~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01f04c06eccf5cd9f3d8d413289b0484a6563571;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix typos [ticket:2294] [ticket:2300]. these are both due to reworkings of 0.6 docs that don't have these typos --- diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 89f2daea9d..4a1ad9e332 100644 --- a/doc/build/orm/tutorial.rst +++ b/doc/build/orm/tutorial.rst @@ -148,7 +148,7 @@ are of course entirely feasible as well. We define a constructor via ``__init__()`` and also a ``__repr__()`` method - both are optional. The class of course can have any number of other methods and attributes as required by the application, as it's basically just a plain Python class. Inheriting from ``Base`` is also only a requirement -of the declarative configurational system, which itself is optional and relatively open ended; at it's +of the declarative configurational system, which itself is optional and relatively open ended; at its core, the SQLAlchemy ORM only requires that a class be a so-called "new style class", that is, it inherits from ``object`` in Python 2, in order to be mapped. All classes in Python 3 are "new style" classes. diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index efaf8f8dbb..a7a478ddfb 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -537,10 +537,7 @@ idioms is below:: id = Column(Integer, primary_key=True) - class MyModel(Base,MyMixin): - __tablename__ = 'test' - name = Column(String(1000)) Where above, the class ``MyModel`` will contain an "id" column