From d6da90f93d6d44365f5c9f6a2290be90ccfc8d60 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sat, 21 Jul 2012 11:17:38 +0200
Subject: [PATCH] Issues #10017 and #14998: Fix TypeError using pprint on
 dictionaries with unorderable key.

---
 Lib/pprint.py           | 6 +++++-
 Lib/test/test_pprint.py | 9 +++++++++
 Misc/NEWS               | 3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Lib/pprint.py b/Lib/pprint.py
index b8417f59225..ae96dde1e02 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 4e53cd8a015..7daf4a7b60c 100644
--- a/Lib/test/test_pprint.py
+++ b/Lib/test/test_pprint.py
@@ -462,6 +462,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):
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a407233982..3d4d049852b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@ Core and Builtins
 Library
 -------
 
+- Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with
+  user-defined types as keys or other unorderable keys.
+
 - Issue #14635: telnetlib will use poll() rather than select() when possible
   to avoid failing due to the select() file descriptor limit.