From f993af3a63767dc9ce15592831ac39b3f36afc97 Mon Sep 17 00:00:00 2001 From: Srinivas Reddy Thatiparthy Date: Sun, 24 Dec 2017 01:32:21 +0530 Subject: [PATCH 1/2] remove OrderedDict reference as dicts are ordered now --- Lib/unittest/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/unittest/util.py b/Lib/unittest/util.py index 45485dcb0df292..e0a407ed5a19dd 100644 --- 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 from os.path import commonprefix __unittest = True @@ -155,7 +155,7 @@ def _count_diff_all_purpose(actual, expected): def _ordered_count(iterable): 'Return dict of element counts, in the order they were first seen' - c = OrderedDict() + c = {} for elem in iterable: c[elem] = c.get(elem, 0) + 1 return c From f57092d7075c36c372ea9b932f1340fcd454c610 Mon Sep 17 00:00:00 2001 From: Srinivas Reddy Thatiparthy Date: Tue, 23 Jan 2018 22:00:07 +0530 Subject: [PATCH 2/2] use Counter from collections module --- Lib/unittest/util.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Lib/unittest/util.py b/Lib/unittest/util.py index e0a407ed5a19dd..050eaed0b3f58f 100644 --- a/Lib/unittest/util.py +++ b/Lib/unittest/util.py @@ -1,6 +1,6 @@ """Various utility functions.""" -from collections import namedtuple +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 = {} - 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)