Skip to content

bpo-32360: Remove OrderedDict reference as dicts are ordered now #4994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 2 commits into from
Jan 24, 2018
Merged

bpo-32360: Remove OrderedDict reference as dicts are ordered now #4994

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f993af3
remove OrderedDict reference as dicts are ordered now
srinivasreddy Dec 23, 2017
f57092d
use Counter from collections module
srinivasreddy Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Lib/unittest/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Various utility functions."""

from collections import namedtuple, OrderedDict
from collections import namedtuple, Counter
from os.path import commonprefix

__unittest = True
Expand Down Expand Up @@ -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)
Expand Down