Updates based upon requests from #22977

Author: bbonenfant

Lib/pprint.py

@@ -556,17 +556,29 @@ def _safe_repr(self, object, context, maxlevels, level):
             return "{%s}" % ", ".join(components), readable, recursive
 
         if (issubclass(typ, list) and r is list.__repr__) or \
-           (issubclass(typ, tuple) and r is tuple.__repr__):
+           (issubclass(typ, tuple) and r is tuple.__repr__) or \
+           (issubclass(typ, set) and r is set.__repr__) or \
+           (issubclass(typ, frozenset) and r is frozenset.__repr__):
             if issubclass(typ, list):
                 if not object:
                     return "[]", True, False
                 format = "[%s]"
-            elif len(object) == 1:
-                format = "(%s,)"
+            elif issubclass(typ, tuple):
+                if len(object) == 1:
+                    format = "(%s,)"
+                else:
+                    if not object:
+                        return "()", True, False
+                    format = "(%s)"
             else:
                 if not object:
-                    return "()", True, False
-                format = "(%s)"
+                    return repr(object), True, False
+                if typ is set:
+                    format = "{%s}"
+                else:
+                    format = typ.__name__ + "({%s})"
+                object = sorted(object, key=_safe_key)
+
             objid = id(object)
             if maxlevels and level >= maxlevels:
                 return format % "...", False, objid in context
@@ -589,37 +601,6 @@ def _safe_repr(self, object, context, maxlevels, level):
             del context[objid]
             return format % ", ".join(components), readable, recursive
 
-        if (issubclass(typ, set) and r is set.__repr__) or \
-            (issubclass(typ, frozenset) and r is frozenset.__repr__):
-            if not object:
-                return repr(object), True, False
-            if typ is set:
-                format = "{%s}"
-            else:
-                format = typ.__name__ + "({%s})"
-            objid = id(object)
-            if maxlevels and level >= maxlevels:
-                return "{...}", False, objid in context
-            if objid in context:
-                return _recursion(object), False, True
-            context[objid] = 1
-            readable = True
-            recursive = False
-            components = []
-            append = components.append
-            level += 1
-            items = sorted(object, key=_safe_key)
-            for item in items:
-                orepr, oreadable, orecur = self.format(
-                    item, context, maxlevels, level)
-                append("%s" % orepr)
-                if not oreadable:
-                    readable = False
-                if orecur:
-                    recursive = True
-            del context[objid]
-            return format % ", ".join(components), readable, recursive
-
         rep = repr(object)
         return rep, (rep and not rep.startswith('<')), False
 

Lib/test/test_pprint.py

@@ -486,8 +486,10 @@ def test_set_reprs(self):
  5,
  6}''')
         self.assertEqual(pprint.pformat(set2([-1, 0, 1])), "set2({-1, 0, 1})")
-        self.assertEqual(pprint.pformat(set2("0123")), "set2({'0', '1', '2', '3'})")
-        self.assertEqual(pprint.pformat(set2("abcd")), "set2({'a', 'b', 'c', 'd'})")
+        self.assertEqual(pprint.pformat(set2("0123")),
+                         "set2({'0', '1', '2', '3'})")
+        self.assertEqual(pprint.pformat(set2("abcd")),
+                         "set2({'a', 'b', 'c', 'd'})")
         self.assertEqual(pprint.pformat(set2(range(7)), width=20), '''\
 set2({0,
       1,