summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-04-15 20:16:46 (GMT)
committerRaymond Hettinger <python@rcn.com>2011-04-15 20:16:46 (GMT)
commit1c746c28f3cfe798ed4d7b51f50adaa685a4fb0e (patch)
tree3d49b1db826c930f49a4a3f1fbf1a52d54a91890 /Lib
parent181810b5febf8f5a66a93158500e302f7fff4d1e (diff)
downloadcpython-1c746c28f3cfe798ed4d7b51f50adaa685a4fb0e.zip
cpython-1c746c28f3cfe798ed4d7b51f50adaa685a4fb0e.tar.gz
cpython-1c746c28f3cfe798ed4d7b51f50adaa685a4fb0e.tar.bz2
Fix minor subclassing issue with collections.Counter
Diffstat (limited to 'Lib')
-rw-r--r--Lib/collections.py4
-rw-r--r--Lib/test/test_collections.py9
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/collections.py b/Lib/collections.py
index 27bb5e1..30301ce 100644
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -459,8 +459,8 @@ class Counter(dict):
self.update(kwds)
def copy(self):
- 'Like dict.copy() but returns a Counter instance instead of a dict.'
- return Counter(self)
+ 'Return a shallow copy.'
+ return self.__class__(self)
def __reduce__(self):
return self.__class__, (dict(self),)
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 8989ac3..3d6ad09 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -680,6 +680,15 @@ class TestCounter(unittest.TestCase):
self.assertEqual(len(dup), len(words))
self.assertEqual(type(dup), type(words))
+ def test_copy_subclass(self):
+ class MyCounter(Counter):
+ pass
+ c = MyCounter('slartibartfast')
+ d = c.copy()
+ self.assertEqual(d, c)
+ self.assertEqual(len(d), len(c))
+ self.assertEqual(type(d), type(c))
+
def test_conversions(self):
# Convert to: set, list, dict
s = 'she sells sea shells by the sea shore'