diff options
| -rw-r--r-- | Lib/pprint.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_pprint.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
3 files changed, 18 insertions, 2 deletions
diff --git a/Lib/pprint.py b/Lib/pprint.py index b8417f5..ae96dde 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -86,7 +86,11 @@ class _safe_key: self.obj = obj def __lt__(self, other): - rv = self.obj.__lt__(other.obj) + try: + rv = self.obj.__lt__(other.obj) + except TypeError: + rv = NotImplemented + if rv is NotImplemented: rv = (str(type(self.obj)), id(self.obj)) < \ (str(type(other.obj)), id(other.obj)) diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index b26291b..95ffab7 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -466,6 +466,15 @@ class QueryTestCase(unittest.TestCase): self.assertEqual(clean(pprint.pformat(dict.fromkeys(keys))), '{' + ','.join('%r:None' % k for k in skeys) + '}') + # Issue 10017: TypeError on user-defined types as dict keys. + self.assertEqual(pprint.pformat({Unorderable: 0, 1: 0}), + '{1: 0, ' + repr(Unorderable) +': 0}') + + # Issue 14998: TypeError on tuples with NoneTypes as dict keys. + self.assertEqual(pprint.pformat({(1,): 0, (None,): 0}), + '{(1,): 0, (None,): 0}') + + class DottedPrettyPrinter(pprint.PrettyPrinter): def format(self, object, context, maxlevels, level): @@ -48,10 +48,13 @@ Core and Builtins - Issue 15307: Virtual environments now use symlinks with framework builds on Mac OS X, like other POSIX builds. - + Library ------- +- Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with + user-defined types as keys or other unorderable keys. + - Issue #15397: inspect.getmodulename() is now based directly on importlib via a new importlib.machinery.all_suffixes() API. |