diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-02-26 19:27:22 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-02-26 19:27:22 -0500 |
| commit | 2d146ddad97e637c399d274c845866d2e21e9b93 (patch) | |
| tree | f428b400c53e238cae31e2cf8d91b8b23147f97c | |
| parent | 6aeec027a0fb33348bdb8ec5b448044a67eff7c5 (diff) | |
| download | sqlalchemy-2d146ddad97e637c399d274c845866d2e21e9b93.tar.gz | |
- Removed stale names from ``sqlalchemy.orm.interfaces.__all__`` and
refreshed with current names, so that an ``import *`` from this
module again works.
fixes #2975
| -rw-r--r-- | doc/build/changelog/changelog_08.rst | 12 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index 0a081d052..fbc59c6c6 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -9,6 +9,18 @@ :start-line: 5 .. changelog:: + :version: 0.8.6 + + .. change:: + :tags: orm, bug + :versions: 0.9.4 + :tickets: 2975 + + Removed stale names from ``sqlalchemy.orm.interfaces.__all__`` and + refreshed with current names, so that an ``import *`` from this + module again works. + +.. changelog:: :version: 0.8.5 :released: February 19, 2014 diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 3d5559be9..1b0bf48a9 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -31,16 +31,16 @@ __all__ = ( 'AttributeExtension', 'EXT_CONTINUE', 'EXT_STOP', - 'ExtensionOption', - 'InstrumentationManager', + 'ONETOMANY', + 'MANYTOMANY', + 'MANYTOONE', + 'NOT_EXTENSION', 'LoaderStrategy', 'MapperExtension', 'MapperOption', 'MapperProperty', 'PropComparator', - 'PropertyOption', 'SessionExtension', - 'StrategizedOption', 'StrategizedProperty', ) |