Import all legacy classes by sqlalchemy.orm.collections.*

Ensure all of the legacy class names like attribute_mapped_collection
are imported by *, instead of only importing the old names partially.

Also remove repeated items from __all__ because these are redundant.

Fixes: #11435

diff --git a/doc/build/changelog/unreleased_20/11435.rst b/doc/build/changelog/unreleased_20/11435.rst
new file mode 100644 (file)
index 0000000..68eac70
--- /dev/null
+++ b/doc/build/changelog/unreleased_20/11435.rst
@@ -0,0 +1,6 @@
+.. change::
+    :tags: bug
+    :tickets: 11435
+
+    Fixed some of the legacy class names not imported by
+    ``sqlalalchemy.orm.collections.*``.

diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index 394a4eaba548f807ed5ba1100c05981a20caed19..956cbd651ac0a5a12086b16e6219fab2981d4b75 100644 (file)
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -148,10 +148,12 @@ __all__ = [
     "keyfunc_mapping",
     "column_keyed_dict",
     "attribute_keyed_dict",
-    "column_keyed_dict",
-    "attribute_keyed_dict",
-    "MappedCollection",
     "KeyFuncDict",
+    # old names in < 2.0
+    "mapped_collection",
+    "column_mapped_collection",
+    "attribute_mapped_collection",
+    "MappedCollection",
 ]
 
 __instrumentation_mutex = threading.Lock()