- Removed stale names from ``sqlalchemy.orm.interfaces.__all__`` and

refreshed with current names, so that an ``import *`` from this
module again works.
fixes #2975

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 72bd3635ed4a7a2eafcaf3aa32e6b6701efdb368..611473144d350fc8fd89bec7437c743592e77d1a 100644 (file)
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -8,6 +8,18 @@
     .. include:: changelog_07.rst
         :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 c01b7d873a7e2a2398bd861cb111b95c922bfda4..cb4351dabbfae623a11008bad5296d24994101e4 100644 (file)
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -28,16 +28,16 @@ __all__ = (
     'AttributeExtension',
     'EXT_CONTINUE',
     'EXT_STOP',
-    'ExtensionOption',
-    'InstrumentationManager',
+    'ONETOMANY',
+    'MANYTOMANY',
+    'MANYTOONE',
+    'NOT_EXTENSION',
     'LoaderStrategy',
     'MapperExtension',
     'MapperOption',
     'MapperProperty',
     'PropComparator',
-    'PropertyOption',
     'SessionExtension',
-    'StrategizedOption',
     'StrategizedProperty',
     )