Merge branch 'main' into matrix_rank-doc-fix

1 files changed, 2 insertions, 14 deletions

diff --git a/numpy/testing/_private/parameterized.py b/numpy/testing/_private/parameterized.py
index ac7db6c40..db9629a94 100644
--- a/numpy/testing/_private/parameterized.py
+++ b/numpy/testing/_private/parameterized.py
@@ -37,11 +37,6 @@ from functools import wraps
 from types import MethodType
 from collections import namedtuple
 
-try:
-    from collections import OrderedDict as MaybeOrderedDict
-except ImportError:
-    MaybeOrderedDict = dict
-
 from unittest import TestCase
 
 _param = namedtuple("param", "args kwargs")
@@ -113,13 +108,6 @@ class param(_param):
         return "param(*%r, **%r)" %self
 
 
-class QuietOrderedDict(MaybeOrderedDict):
-    """ When OrderedDict is available, use it to make sure that the kwargs in
-        doc strings are consistently ordered. """
-    __str__ = dict.__str__
-    __repr__ = dict.__repr__
-
-
 def parameterized_argument_value_pairs(func, p):
     """Return tuples of parameterized arguments and their values.
 
@@ -165,7 +153,7 @@ def parameterized_argument_value_pairs(func, p):
     ])
 
     seen_arg_names = {n for (n, _) in result}
-    keywords = QuietOrderedDict(sorted([
+    keywords = dict(sorted([
         (name, p.kwargs[name])
         for name in p.kwargs
         if name not in seen_arg_names
@@ -339,7 +327,7 @@ class parameterized:
                             "'@parameterized.expand' instead.")
 
     def _terrible_magic_get_defining_classes(self):
-        """ Returns the set of parent classes of the class currently being defined.
+        """ Returns the list of parent classes of the class currently being defined.
             Will likely only work if called from the ``parameterized`` decorator.
             This function is entirely @brandon_rhodes's fault, as he suggested
             the implementation: http://stackoverflow.com/a/8793684/71522