diff options
| -rw-r--r-- | doc/build/orm/tutorial.rst | 2 | ||||
| -rwxr-xr-x | lib/sqlalchemy/ext/declarative.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 89f2daea9..4a1ad9e33 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 efaf8f8db..a7a478ddf 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 |