Merge pull request #682 from marcharper/style

Style and Temp file closing warning fix

Author: meatballs

axelrod/_strategy_utils.py

@@ -112,8 +112,7 @@ def __repr__(self):
 @Memoized
 def recursive_thue_morse(n):
     """The recursive definition of the Thue-Morse sequence. The first few terms
-    of the Thue-Morse sequence are:
-    0 1 1 0 1 0 0 1 1 0 0 1 0 1 1 0 . . ."""
+    of the Thue-Morse sequence are: 0 1 1 0 1 0 0 1 1 0 0 1 0 1 1 0 . . ."""
 
     if n == 0:
         return 0

axelrod/ecosystem.py

@@ -1,4 +1,3 @@
-
 import random
 
 

axelrod/match_generator.py

@@ -123,10 +123,10 @@ def build_single_match_params(self):
         Creates a single set of match parameters.
         """
         return (
-            self.sample_length(self.prob_end), self.game, None, self.noise,
+            self.sample_length(), self.game, None, self.noise,
             {'length': float('inf'), 'game': self.game, 'noise': self.noise})
 
-    def sample_length(self, prob_end):
+    def sample_length(self):
         """
         Sample length of a game.
 

axelrod/player.py

@@ -149,10 +149,9 @@ def clone(self):
 
     def reset(self):
         """Resets history.
-
-        When creating strategies that create new attributes then this method should be
-        re-written (in the inherited class) and should not only reset history but also
-        rest all other attributes.
+        When creating strategies that create new attributes then this method
+        should be re-written (in the inherited class) and should not only reset
+        history but also rest all other attributes.
         """
         self.history = []
         self.cooperations = 0

axelrod/plot.py

@@ -103,14 +103,6 @@ def winplot(self, title=None):
     def _sd_ordering(self):
         return self.result_set.ranking
 
-        # Sort by median then max
-        # from operator import itemgetter
-        # diffs = self.result_set.score_diffs
-        # to_sort = [(median(d), max(d), i) for (i, d) in enumerate(diffs)]
-        # to_sort.sort(reverse=True, key=itemgetter(0, 1))
-        # ordering = [x[-1] for x in to_sort]
-        # return ordering
-
     @property
     def _sdv_plot_dataset(self):
         ordering = self._sd_ordering
@@ -231,7 +223,8 @@ def stackplot(self, eco, title=None, logscale=True):
         for i, n in enumerate(self.result_set.ranked_names):
             x = -0.01
             y = (i + 0.5) * 1.0 / self.result_set.nplayers
-            ax.annotate(n, xy=(x, y), xycoords=trans, clip_on=False, va='center', ha='right', fontsize=5)
+            ax.annotate(n, xy=(x, y), xycoords=trans, clip_on=False,
+                        va='center', ha='right', fontsize=5)
             ticks.append(y)
         ax.set_yticks(ticks)
         ax.tick_params(direction='out')

axelrod/result_set.py

@@ -1,4 +1,3 @@
-from collections import defaultdict
 import csv
 import tqdm
 
@@ -8,13 +7,6 @@
 from .game import Game
 import axelrod.interaction_utils as iu
 
-try:
-    # Python 2
-    from StringIO import StringIO
-except ImportError:
-    # Python 3
-    from io import StringIO
-
 
 def update_progress_bar(method):
     """A decorator to update a progress bar if it exists"""

axelrod/strategies/adaptive.py

@@ -1,4 +1,4 @@
-from axelrod import Actions, Player, Game, init_args
+from axelrod import Actions, Player, init_args
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/apavlov.py

@@ -1,4 +1,4 @@
-from axelrod import Actions, Player, flip_action
+from axelrod import Actions, Player
 
 C, D = Actions.C, Actions.D
 
@@ -51,15 +51,15 @@ def strategy(self, opponent):
         if self.opponent_class == "STFT":
             if len(self.history) % 6 in [0, 1]:
                 return C
-            #TFT
+            # TFT
             if opponent.history[-1:] == [D]:
                 return D
         if self.opponent_class == "PavlovD":
             # Return D then C for the period
             if len(self.history) % 6 == 0:
                 return D
         if self.opponent_class == "Cooperative":
-            #TFT
+            # TFT
             if opponent.history[-1:] == [D]:
                 return D
         return C
@@ -112,10 +112,10 @@ def strategy(self, opponent):
         if self.opponent_class in ["Random", "ALLD"]:
             return D
         if self.opponent_class == "STFT":
-            #TFTT
+            # TFTT
             return D if opponent.history[-2:] == [D, D] else C
         if self.opponent_class == "Cooperative":
-            #TFT
+            # TFT
             return D if opponent.history[-1:] == [D] else C
 
     def reset(self):

axelrod/strategies/averagecopier.py

@@ -1,5 +1,3 @@
-import random
-
 from axelrod import Actions, Player, random_choice
 
 

axelrod/strategies/axelrod_first.py

@@ -2,10 +2,9 @@
 Additional strategies from Axelrod's first tournament.
 """
 
-from math import sqrt
 import random
 
-from axelrod import Actions, Game, Player, init_args, flip_action, random_choice
+from axelrod import Actions, Player, init_args, flip_action, random_choice
 
 from.memoryone import MemoryOnePlayer