From ddb32f0b36756cc9c0fb9f3756521d10f6fe2efc Mon Sep 17 00:00:00 2001 From: Wok Date: Mon, 14 May 2018 16:23:27 +0200 Subject: [PATCH 1/2] Python 3 compatibility: replace iterkeys() with keys(). --- schulze.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schulze.py b/schulze.py index 59099a4..f567ae7 100644 --- a/schulze.py +++ b/schulze.py @@ -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] From a62bb9b1a8f9b12f3f33cebb6050116422c92a4b Mon Sep 17 00:00:00 2001 From: Wok Date: Mon, 14 May 2018 16:24:34 +0200 Subject: [PATCH 2/2] Python 3 compatibility: replace itertools.izip() with zip(). --- schulze_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schulze_test.py b/schulze_test.py index 5fc6e69..bc105aa 100644 --- a/schulze_test.py +++ b/schulze_test.py @@ -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' %