Remove some deprecated trait types and instances; reorder api.py (#1723)

This PR: - Removes long-deprecated trait type aliases of the form `DictStrAny`, `DictStrFloat`, `ListFloat`, `ListThis`, etc. - Reorders the top-level `api.py` so that the deprecated trait types appear at the bottom of the file.
enthought · Oct 17, 2022 · d536bba · d536bba
1 parent ecf5de5
commit d536bba
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 449 deletions.
diff --git a/docs/source/traits_api_reference/trait_types.rst b/docs/source/traits_api_reference/trait_types.rst
@@ -287,36 +287,6 @@ and may be removed in a future version of Traits.
 
 .. autodata:: undefined
 
-.. autodata:: ListInt
-
-.. autodata:: ListFloat
-
-.. autodata:: ListStr
-
-.. autodata:: ListUnicode
-
-.. autodata:: ListComplex
-
-.. autodata:: ListBool
-
-.. autodata:: ListFunction
-
-.. autodata:: ListMethod
-
-.. autodata:: ListThis
-
-.. autodata:: DictStrAny
-
-.. autodata:: DictStrStr
-
-.. autodata:: DictStrInt
-
-.. autodata:: DictStrFloat
-
-.. autodata:: DictStrBool
-
-.. autodata:: DictStrList
-
 
 Private Classes
 ---------------

diff --git a/traits/api.py b/traits/api.py
@@ -116,33 +116,6 @@
     Supports,
 )
 
-# Deprecated TraitType subclasses and instances.
-
-from .trait_types import (
-    BaseUnicode,
-    Unicode,
-    BaseCUnicode,
-    CUnicode,
-    false,
-    true,
-    undefined,
-    ListInt,
-    ListFloat,
-    ListStr,
-    ListUnicode,
-    ListComplex,
-    ListBool,
-    ListFunction,
-    ListMethod,
-    ListThis,
-    DictStrAny,
-    DictStrStr,
-    DictStrInt,
-    DictStrFloat,
-    DictStrBool,
-    DictStrList,
-)
-
 from .trait_types import (
     BaseCallable,
     BaseInt,
@@ -218,3 +191,15 @@
 )
 
 from .trait_numeric import Array, ArrayOrNone, CArray
+
+# Deprecated TraitType subclasses and instances.
+
+from .trait_types import (
+    BaseUnicode,
+    Unicode,
+    BaseCUnicode,
+    CUnicode,
+    false,
+    true,
+    undefined,
+)
diff --git a/traits/api.pyi b/traits/api.pyi
@@ -135,21 +135,6 @@ from .trait_types import (
     false as false,
     true as true,
     undefined as undefined,
-    ListInt as ListInt,
-    ListFloat as ListFloat,
-    ListStr as ListStr,
-    ListUnicode as ListUnicode,
-    ListComplex as ListComplex,
-    ListBool as ListBool,
-    ListFunction as ListFunction,
-    ListMethod as ListMethod,
-    ListThis as ListThis,
-    DictStrAny as DictStrAny,
-    DictStrStr as DictStrStr,
-    DictStrInt as DictStrInt,
-    DictStrFloat as DictStrFloat,
-    DictStrBool as DictStrBool,
-    DictStrList as DictStrList,
 )
 
 from .trait_types import (

diff --git a/traits/stubs_tests/examples/DictStrAny.py b/traits/stubs_tests/examples/DictStrAny.py
diff --git a/traits/stubs_tests/examples/DictStrFloat.py b/traits/stubs_tests/examples/DictStrFloat.py
diff --git a/traits/stubs_tests/examples/DictStrInt.py b/traits/stubs_tests/examples/DictStrInt.py
diff --git a/traits/stubs_tests/examples/ListBool.py b/traits/stubs_tests/examples/ListBool.py
diff --git a/traits/stubs_tests/examples/ListComplex.py b/traits/stubs_tests/examples/ListComplex.py
diff --git a/traits/stubs_tests/examples/ListFloat.py b/traits/stubs_tests/examples/ListFloat.py
diff --git a/traits/stubs_tests/examples/ListInt.py b/traits/stubs_tests/examples/ListInt.py