Skip to content

bpo-39075: types.SimpleNamespace no longer sorts attributes in its repr #19430

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

Merged
miss-islington merged 3 commits into from
May 16, 2020
Merged

bpo-39075: types.SimpleNamespace no longer sorts attributes in its repr #19430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
129650c
bpo-39075: types.SimpleNamespace no longer sorts attributes in its repr
ZackerySpytz Apr 8, 2020
a89af4e
Merge remote-tracking branch 'upstream/master' into bpo-39075-SimpleN…
ZackerySpytz May 12, 2020
c11058b
Address comments.
ZackerySpytz May 12, 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
6 changes: 4 additions & 2 deletions Doc/library/types.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,7 @@ Additional Utility Classes and Functions
self.__dict__.update(kwargs)

def __repr__(self):
keys = sorted(self.__dict__)
items = ("{}={!r}".format(k, self.__dict__[k]) for k in keys)
items = (f"{k}={v!r}" for k, v in self.__dict__.items())
return "{}({})".format(type(self).__name__, ", ".join(items))

def __eq__(self, other):
Expand All @@ -368,6 +367,9 @@ Additional Utility Classes and Functions

.. versionadded:: 3.3

.. versionchanged:: 3.9
Attribute order in the repr changed from alphabetical to insertion (like
``dict``).

.. function:: DynamicClassAttribute(fget=None, fset=None, fdel=None, doc=None)

Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,8 +1262,8 @@ def test_repr(self):
ns2._y = 5
name = "namespace"

self.assertEqual(repr(ns1), "{name}(w=3, x=1, y=2)".format(name=name))
self.assertEqual(repr(ns2), "{name}(_y=5, x='spam')".format(name=name))
self.assertEqual(repr(ns1), "{name}(x=1, y=2, w=3)".format(name=name))
self.assertEqual(repr(ns2), "{name}(x='spam', _y=5)".format(name=name))

def test_equal(self):
ns1 = types.SimpleNamespace(x=1)
Expand Down Expand Up @@ -1312,7 +1312,7 @@ def test_recursive_repr(self):
ns3.spam = ns2
name = "namespace"
repr1 = "{name}(c='cookie', spam={name}(...))".format(name=name)
repr2 = "{name}(spam={name}(spam={name}(...), x=1))".format(name=name)
repr2 = "{name}(spam={name}(x=1, spam={name}(...)))".format(name=name)

self.assertEqual(repr(ns1), repr1)
self.assertEqual(repr(ns2), repr2)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-04-07-23-44-06.bpo-39075.hgck3j.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The repr for :class:`types.SimpleNamespace` is now insertion ordered rather
than alphabetical.
2 changes: 0 additions & 2 deletions Objects/namespaceobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ namespace_repr(PyObject *ns)
keys = PyDict_Keys(d);
if (keys == NULL)
goto error;
if (PyList_Sort(keys) != 0)
goto error;

keys_iter = PyObject_GetIter(keys);
if (keys_iter == NULL)
Expand Down