Change the way the game is passed to tourn, res.

No longer setting a tournament/resultset class attribute. Everything is
done in init.

Author: drvinceknight

axelrod/result_set.py

@@ -33,7 +33,6 @@ def wrapper(*args):
 
 class ResultSet(object):
     """A class to hold the results of a tournament."""
-    game = Game()
 
     def __init__(self, players, interactions, progress_bar=True, game=None):
         """
@@ -47,7 +46,9 @@ def __init__(self, players, interactions, progress_bar=True, game=None):
             progress_bar : bool
                 Whether or not to create a progress bar which will be updated
         """
-        if game is not None:
+        if game is None:
+            self.game = Game()
+        else:
             self.game = game
         self.players = players
         self.nplayers = len(players)

axelrod/tournament.py

@@ -16,7 +16,6 @@
 
 
 class Tournament(object):
-    game = Game()
 
     def __init__(self, players, match_generator=RoundRobinMatches,
                  name='axelrod', game=None, turns=200, repetitions=10,
@@ -43,12 +42,14 @@ def __init__(self, players, match_generator=RoundRobinMatches,
         with_morality : boolean
             Whether morality metrics should be calculated
         """
+        if game is None:
+            self.game = Game()
+        else:
+            self.game = game
         self.name = name
         self.turns = turns
         self.noise = noise
         self.num_interactions = 0
-        if game is not None:
-            self.game = game
         self.players = players
         self.repetitions = repetitions
         self.match_generator = match_generator(