More PEP8 and style fixes

Author: marcharper

axelrod/deterministic_cache.py

@@ -1,10 +1,10 @@
 from collections import UserDict
 import pickle
-from typing import List, Tuple
 
 from .actions import Action
 from .player import Player
 
+from typing import List, Tuple
 
 CachePlayerKey = Tuple[Player, Player, int]
 CacheKey = Tuple[str, str, int]

axelrod/ecosystem.py

@@ -1,5 +1,5 @@
-from axelrod.result_set import ResultSet
 import random
+from axelrod.result_set import ResultSet
 from typing import List, Callable
 
 

axelrod/fingerprint.py

@@ -1,7 +1,6 @@
 from collections import namedtuple
 from tempfile import NamedTemporaryFile
 import matplotlib.pyplot as plt
-from typing import List, Any, Union
 import numpy as np
 import tqdm
 
@@ -11,6 +10,7 @@
 from axelrod.interaction_utils import (
     compute_final_score_per_turn, read_interactions_from_file)
 
+from typing import List, Any, Union
 
 Point = namedtuple('Point', 'x y')
 

axelrod/mock_player.py

@@ -1,11 +1,11 @@
 from collections import defaultdict
 from itertools import cycle
-from typing import List, Tuple
 import warnings
 
 from axelrod.actions import Actions, Action
 from axelrod.player import Player, update_history, update_state_distribution
 
+from typing import List, Tuple
 
 C, D = Actions.C, Actions.D
 

axelrod/player.py

@@ -3,14 +3,14 @@
 import inspect
 import itertools
 import random
-import types
-from typing import Dict, Any
 
 import numpy as np
 
 from axelrod.actions import Actions, flip_action
 from .game import DefaultGame
 
+import types
+from typing import Dict, Any
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/adaptive.py

@@ -1,6 +1,5 @@
 from axelrod.actions import Actions, Action
 from axelrod.player import Player
-import axelrod
 
 from typing import List
 

axelrod/strategies/ann.py

@@ -6,12 +6,12 @@
 
 import numpy as np
 
-from typing import List, Tuple
-
 from axelrod.actions import Actions, Action
 from axelrod.player import Player
 from axelrod.load_data_ import load_weights
 
+from typing import List, Tuple
+
 C, D = Actions.C, Actions.D
 nn_weights = load_weights()
 
@@ -69,8 +69,6 @@ def compute_features(player: Player, opponent: Player) -> List[int]:
         opponent_previous2_c = 0
         opponent_previous2_d = 0
 
-
-
     else:
         opponent_first_c = 1 if opponent.history[0] == C else 0
         opponent_first_d = 1 if opponent.history[0] == D else 0
@@ -179,7 +177,8 @@ class ANN(Player):
         'long_run_time': False
     }
 
-    def __init__(self, weights: List[float], num_features: int, num_hidden: int) -> None:
+    def __init__(self, weights: List[float], num_features: int,
+                 num_hidden: int) -> None:
         super().__init__()
         (i2h, h2o, bias) = split_weights(weights, num_features, num_hidden)
         self.input_to_hidden_layer_weights = np.matrix(i2h)

axelrod/strategies/apavlov.py

@@ -1,4 +1,3 @@
-
 from axelrod.actions import Actions, Action
 from axelrod.player import Player
 
@@ -29,7 +28,7 @@ class APavlov2006(Player):
 
     def __init__(self) -> None:
         super().__init__()
-        self.opponent_class = None # type: str
+        self.opponent_class = None  # type: str
 
     def strategy(self, opponent: Player) -> Action:
         # TFT for six rounds

axelrod/strategies/axelrod_first.py

@@ -7,8 +7,9 @@
 from axelrod.actions import Actions, flip_action, Action
 from axelrod.player import Player
 from axelrod.random_ import random_choice
-from.memoryone import MemoryOnePlayer
 from axelrod.strategy_transformers import FinalTransformer
+from .memoryone import MemoryOnePlayer
+
 from scipy.stats import chisquare
 
 from typing import List, Dict, Tuple

axelrod/strategies/backstabber.py

@@ -1,7 +1,6 @@
-from axelrod.actions import Actions
+from axelrod.actions import Action, Actions
 from axelrod.player import Player
 from axelrod.strategy_transformers import FinalTransformer
-from axelrod.actions import Action
 
 C, D = Actions.C, Actions.D
 
@@ -58,7 +57,8 @@ def strategy(self, opponent: Player) -> Action:
 
 def _backstabber_strategy(opponent: Player) -> Action:
     """
-    Cooperates until opponent defects a total of four times, then always defects.
+    Cooperates until opponent defects a total of four times, then always
+    defects.
     """
     if not opponent.history:
         return C
@@ -69,7 +69,8 @@ def _backstabber_strategy(opponent: Player) -> Action:
 
 def _alt_strategy(opponent: Player) -> Action:
     """
-    If opponent's previous two plays were defect, then defects on next round. Otherwise, cooperates.
+    If opponent's previous two plays were defect, then defects on next round.
+    Otherwise, cooperates.
     """
     previous_two_plays = opponent.history[-2:]
     if previous_two_plays == [D, D]:
@@ -79,8 +80,8 @@ def _alt_strategy(opponent: Player) -> Action:
 
 def _opponent_triggers_alt_strategy(opponent: Player) -> bool:
     """
-    If opponent did not defect in first 7 rounds and the current round is from 8 to 180, return True.
-    Else, return False.
+    If opponent did not defect in first 7 rounds and the current round is from 8
+    to 180, return True. Else, return False.
     """
     before_alt_strategy = first_n_rounds = 7
     last_round_of_alt_strategy = 180
@@ -90,7 +91,8 @@ def _opponent_triggers_alt_strategy(opponent: Player) -> bool:
     return before_alt_strategy < current_round <= last_round_of_alt_strategy
 
 
-def _opponent_defected_in_first_n_rounds(opponent: Player, first_n_rounds: int) -> bool:
+def _opponent_defected_in_first_n_rounds(opponent: Player, first_n_rounds: int
+                                         ) -> bool:
     """
     If opponent defected in the first N rounds, return True. Else return False.
     """