Bug #1153: repr.repr() now doesn't require set and dictionary items
to be orderable to properly represent them.
diff --git a/Lib/repr.py b/Lib/repr.py
index 59015b1..3c26cc3 100644
--- a/Lib/repr.py
+++ b/Lib/repr.py
@@ -1,4 +1,4 @@
-"""Redo the `...` (representation) but with limits on most sizes."""
+"""Redo the builtin repr() (representation) but with limits on most sizes."""
__all__ = ["Repr","repr"]
@@ -62,11 +62,11 @@
return self._repr_iterable(x, level, header, '])', self.maxarray)
def repr_set(self, x, level):
- x = sorted(x)
+ x = _possibly_sorted(x)
return self._repr_iterable(x, level, 'set([', '])', self.maxset)
def repr_frozenset(self, x, level):
- x = sorted(x)
+ x = _possibly_sorted(x)
return self._repr_iterable(x, level, 'frozenset([', '])',
self.maxfrozenset)
@@ -80,7 +80,7 @@
newlevel = level - 1
repr1 = self.repr1
pieces = []
- for key in islice(sorted(x), self.maxdict):
+ for key in islice(_possibly_sorted(x), self.maxdict):
keyrepr = repr1(key, newlevel)
valrepr = repr1(x[key], newlevel)
pieces.append('%s: %s' % (keyrepr, valrepr))
@@ -110,7 +110,7 @@
s = __builtin__.repr(x)
# Bugs in x.__repr__() can cause arbitrary
# exceptions -- then make up something
- except:
+ except Exception:
return '<%s instance at %x>' % (x.__class__.__name__, id(x))
if len(s) > self.maxstring:
i = max(0, (self.maxstring-3)//2)
@@ -118,5 +118,15 @@
s = s[:i] + '...' + s[len(s)-j:]
return s
+
+def _possibly_sorted(x):
+ # Since not all sequences of items can be sorted and comparison
+ # functions may raise arbitrary exceptions, return an unsorted
+ # sequence in that case.
+ try:
+ return sorted(x)
+ except Exception:
+ return list(x)
+
aRepr = Repr()
repr = aRepr.repr
diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py
index a07ed71..6284f40 100644
--- a/Lib/test/test_repr.py
+++ b/Lib/test/test_repr.py
@@ -196,6 +196,16 @@
x = classmethod(C.foo)
self.failUnless(repr(x).startswith('<classmethod object at 0x'))
+ def test_unsortable(self):
+ # Repr.repr() used to call sorted() on sets, frozensets and dicts
+ # without taking into account that not all objects are comparable
+ x = set([1j, 2j, 3j])
+ y = frozenset(x)
+ z = {1j: 1, 2j: 2}
+ r(x)
+ r(y)
+ r(z)
+
def touch(path, text=''):
fp = open(path, 'w')
fp.write(text)