From: Jens Reidel <jens@troet.org>
Date: Wed, 18 Mar 2020 02:22:46 +0000 (+0100)
Subject: bpo-39957: Change Signature.parameters to OrderedDict (GH-18988)
X-Git-Tag: v3.9.0a5~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=611836a69a7a98bb106b4d315ed76a1e17266f4f;p=thirdparty%2FPython%2Fcpython.git

bpo-39957: Change Signature.parameters to OrderedDict (GH-18988)
---

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 125bd456a1c4..90435a10caac 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -2733,7 +2733,7 @@ class Signature:
 
     A Signature object has the following public attributes and methods:
 
-    * parameters : dict
+    * parameters : OrderedDict
         An ordered mapping of parameters' names to the corresponding
         Parameter objects (keyword-only arguments are in the same order
         as listed in `code.co_varnames`).
@@ -2763,10 +2763,10 @@ class Signature:
         """
 
         if parameters is None:
-            params = {}
+            params = OrderedDict()
         else:
             if __validate_parameters__:
-                params = {}
+                params = OrderedDict()
                 top_kind = _POSITIONAL_ONLY
                 kind_defaults = False
 
@@ -2805,7 +2805,7 @@ class Signature:
 
                     params[name] = param
             else:
-                params = {param.name: param for param in parameters}
+                params = OrderedDict((param.name, param) for param in parameters)
 
         self._parameters = types.MappingProxyType(params)
         self._return_annotation = return_annotation
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 8a2efc879323..f193807e8047 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -2077,7 +2077,7 @@ class TestSignatureObject(unittest.TestCase):
         P = inspect.Parameter
 
         self.assertEqual(str(S()), '()')
-        self.assertEqual(repr(S().parameters), 'mappingproxy({})')
+        self.assertEqual(repr(S().parameters), 'mappingproxy(OrderedDict())')
 
         def test(po, pk, pod=42, pkd=100, *args, ko, **kwargs):
             pass
@@ -3181,6 +3181,11 @@ class TestSignatureObject(unittest.TestCase):
         l = list(signature.parameters)
         self.assertEqual(l, unsorted_keyword_only_parameters)
 
+    def test_signater_parameters_is_ordered(self):
+        p1 = inspect.signature(lambda x, y: None).parameters
+        p2 = inspect.signature(lambda y, x: None).parameters
+        self.assertNotEqual(p1, p2)
+
 
 class TestParameterObject(unittest.TestCase):
     def test_signature_parameter_kinds(self):