From: Raymond Hettinger <python@rcn.com>
Date: Sat, 5 Nov 2011 20:39:57 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a1~932
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1182cd4dbd2556c5cfeae24deb889e514979b18;p=thirdparty%2FPython%2Fcpython.git

Merge
---

f1182cd4dbd2556c5cfeae24deb889e514979b18
diff --cc Lib/test/test_collections.py
index ec2093891791,8dc5559cae3a..c9b7f6b6bf73
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@@ -964,11 -893,12 +964,17 @@@ class TestCounter(unittest.TestCase)
          c.subtract('aaaabbcce')
          self.assertEqual(c, Counter(a=-1, b=0, c=-1, d=1, e=-1))
  
 +    def test_unary(self):
 +        c = Counter(a=-5, b=0, c=5, d=10, e=15,g=40)
 +        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')