bpo-32360: unittest.util: Use Counter instead of custom count function (GH-4994)

srinivasreddy · methane · commit 018e1b7aad8d · 2018-01-24T16:49:58.000+09:00
diff --git a/Lib/unittest/util.py b/Lib/unittest/util.py
@@ -1,6 +1,6 @@
 """Various utility functions."""
 
-from collections import namedtuple, OrderedDict
+from collections import namedtuple, Counter
 from os.path import commonprefix
 
 __unittest = True
@@ -153,17 +153,10 @@ def _count_diff_all_purpose(actual, expected):
         result.append(diff)
     return result
 
-def _ordered_count(iterable):
-    'Return dict of element counts, in the order they were first seen'
-    c = OrderedDict()
-    for elem in iterable:
-        c[elem] = c.get(elem, 0) + 1
-    return c
-
 def _count_diff_hashable(actual, expected):
     'Returns list of (cnt_act, cnt_exp, elem) triples where the counts differ'
     # elements must be hashable
-    s, t = _ordered_count(actual), _ordered_count(expected)
+    s, t = Counter(actual), Counter(expected)
     result = []
     for elem, cnt_s in s.items():
         cnt_t = t.get(elem, 0)
