Skip to content

Python 3 compatibility #4

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

Open
woctezuma wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python 3 compatibility #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb32f0
Python 3 compatibility: replace iterkeys() with keys().
woctezuma May 14, 2018
a62bb9b
Python 3 compatibility: replace itertools.izip() with zip().
woctezuma May 14, 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
2 changes: 1 addition & 1 deletion schulze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _rank_p(candidate_names, p):

candidate_wins[num_wins].append(candidate_name1)

sorted_wins = sorted(candidate_wins.iterkeys(), reverse=True)
sorted_wins = sorted(candidate_wins.keys(), reverse=True)
return [candidate_wins[num_wins] for num_wins in sorted_wins]


Expand Down
2 changes: 1 addition & 1 deletion schulze_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def _make_ranks(self, names):

def _assert_row(self, matrix, name, expected_values):
other_names = (other_name for other_name in 'abcde' if other_name != name)
for other_name, expected_value in itertools.izip(other_names, expected_values):
for other_name, expected_value in zip(other_names, expected_values):
actual_value = matrix.get((name, other_name), 0)
self.assertEqual(expected_value, actual_value,
'matrix(%s, %s)=%s, expected %s' %
Expand Down