Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-39957: Change Signature.parameters to OrderedDict #18988

Merged
merged 7 commits into from
Mar 18, 2020
+10 −5
Merged

bpo-39957: Change Signature.parameters to OrderedDict #18988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9dfc8a1
bpo-39957: Change inspect.Signature.parameters back to OrderedDict
Gelbpunkt Mar 14, 2020
185530b
Adjust tests to pass
Gelbpunkt Mar 14, 2020
bdcb0c7
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 14, 2020
e97ab94
Remove unneeded parens and enumerate call
Gelbpunkt Mar 14, 2020
28cc583
Merge branch 'fix-signature-parameters' of https://github.com/Gelbpun…
Gelbpunkt Mar 14, 2020
5fdcb44
Delete 2020-03-14-10-20-14.bpo-39957.Dyj0Lj.rst
methane Mar 18, 2020
8da0e17
Add test
methane Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand Down Expand Up @@ -2763,10 +2763,10 @@ def __init__(self, parameters=None, *, return_annotation=_empty,
"""

if parameters is None:
params = {}
params = OrderedDict()
else:
if __validate_parameters__:
params = {}
params = OrderedDict()
top_kind = _POSITIONAL_ONLY
kind_defaults = False

Expand Down Expand Up @@ -2805,7 +2805,7 @@ def __init__(self, parameters=None, *, return_annotation=_empty,

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
Expand Down
7 changes: 6 additions & 1 deletion Lib/test/test_inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2077,7 +2077,7 @@ def test_signature_object(self):
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
Expand Down Expand Up @@ -3181,6 +3181,11 @@ def test_signature_definition_order_preserved_on_kwonly(self):
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):
Expand Down