Update iterators to pass python3 tests

Author: marcharper

axelrod/result_set.py

@@ -48,7 +48,7 @@ def _null_matrix(self):
 
     def _results(self, outcome):
         results = {}
-        for result_type, result_list in outcome.iteritems():
+        for result_type, result_list in outcome.items():
             matrix = self._null_matrix()
             for index, result_matrix in enumerate(result_list):
                 for i in range(len(self.players)):
@@ -122,26 +122,12 @@ def _normalised_cooperation(self, cooperation):
             for row in cooperation]
 
     def csv(self):
-<<<<<<< HEAD
-        if self._finalised:
-            csv_string = StringIO()
-            header = ",".join(self.ranked_names) + "\n"
-            csv_string.write(header)
-            writer = csv.writer(csv_string, lineterminator="\n")
-            for irep in range(self.repetitions):
-                data = [self.normalised_scores[rank][irep] for rank in self.ranking]
-                writer.writerow(list(map(str, data)))
-            return csv_string.getvalue()
-        else:
-            raise AttributeError(self.unfinalised_error_msg)
-=======
         csv_string = StringIO()
         header = ",".join(self.ranked_names) + "\n"
         csv_string.write(header)
         writer = csv.writer(csv_string, lineterminator="\n")
         for irep in range(self.repetitions):
             data = [self.normalised_scores[rank][irep]
                     for rank in self.ranking]
-            writer.writerow(map(str, data))
+            writer.writerow(list(map(str, data)))
         return csv_string.getvalue()
->>>>>>> refactor resultset to use payoffs and cooperation lists in init

axelrod/tests/unit/test_round_robin.py

@@ -102,16 +102,6 @@ def test_pair_of_players(self):
         player2.name = 'player 2'
         self.assertNotEqual(player1.name, player2.name)
 
-    def test_deterministic_cache(self):
-        p1, p2, p3 = axelrod.Cooperator(), axelrod.Defector(), axelrod.Random()
-        rr = axelrod.RoundRobin(players=[p1, p2, p3], game=self.game, turns=20)
-        self.assertEqual(rr.deterministic_cache, {})
-        rr.play()
-        self.assertEqual(rr.deterministic_cache[(axelrod.Defector, axelrod.Defector)], (20, 20))
-        self.assertEqual(rr.deterministic_cache[(axelrod.Cooperator, axelrod.Cooperator)], (60, 60))
-        self.assertEqual(rr.deterministic_cache[(axelrod.Cooperator, axelrod.Defector)], (0, 100))
-        self.assertFalse((axelrod.Random, axelrod.Random) in rr.deterministic_cache)
-
     def test_stochastic_interaction(self):
         p1, p2 = axelrod.Player(), axelrod.Player()
         rr = axelrod.RoundRobin(