Merge
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 68b63a8..6cae1dd 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -585,8 +585,12 @@
def __repr__(self):
if not self:
return '%s()' % self.__class__.__name__
- items = ', '.join(map('%r: %r'.__mod__, self.most_common()))
- return '%s({%s})' % (self.__class__.__name__, items)
+ try:
+ items = ', '.join(map('%r: %r'.__mod__, self.most_common()))
+ return '%s({%s})' % (self.__class__.__name__, items)
+ except TypeError:
+ # handle case where values are not orderable
+ return '{0}({1!r})'.format(self.__class__.__name__, dict(self))
# Multiset-style mathematical operations discussed in:
# Knuth TAOCP Volume II section 4.6.3 exercise 19
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index ec20938..c9b7f6b 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -969,6 +969,12 @@
self.assertEqual(dict(+c), dict(c=5, d=10, e=15, g=40))
self.assertEqual(dict(-c), dict(a=5))
+ def test_repr_nonsortable(self):
+ c = Counter(a=2, b=None)
+ r = repr(c)
+ self.assertIn("'a': 2", r)
+ self.assertIn("'b': None", r)
+
def test_helper_function(self):
# two paths, one for real dicts and one for other mappings
elems = list('abracadabra')