Merge pull request #863 from janga1997/typeHint7

Add type hints to mindcontrol, mindreader, mutual, negation

Author: meatballs

axelrod/strategies/mindcontrol.py

@@ -1,4 +1,4 @@
-from axelrod.actions import Actions
+from axelrod.actions import Actions, Action
 from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
@@ -19,7 +19,7 @@ class MindController(Player):
     }
 
     @staticmethod
-    def strategy(opponent):
+    def strategy(opponent: Player) -> Action:
         """
         Alters the opponents strategy method to be a lambda function which
         always returns C. This player will then always return D to take
@@ -47,14 +47,14 @@ class MindWarper(Player):
         'manipulates_state': False
     }
 
-    def __setattr__(self, name, val):
+    def __setattr__(self, name: str, val: str):
         if name == 'strategy':
             pass
         else:
             self.__dict__[name] = val
 
     @staticmethod
-    def strategy(opponent):
+    def strategy(opponent: Player) -> Action:
         opponent.strategy = lambda opponent: C
         return D
 
@@ -77,6 +77,6 @@ class MindBender(MindWarper):
     }
 
     @staticmethod
-    def strategy(opponent):
+    def strategy(opponent: Player) -> Action:
         opponent.__dict__['strategy'] = lambda opponent: C
         return D

axelrod/strategies/mindreader.py

@@ -1,6 +1,6 @@
 import inspect
 
-from axelrod.actions import Actions
+from axelrod.actions import Actions, Action
 from axelrod.player import Player
 from axelrod._strategy_utils import look_ahead
 
@@ -22,7 +22,7 @@ class MindReader(Player):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         """Pretends to play the opponent a number of times before each match.
         The primary purpose is to look far enough ahead to see if a defect will
         be punished by the opponent.
@@ -61,7 +61,7 @@ class ProtectedMindReader(MindReader):
         'manipulates_state': False
     }
 
-    def __setattr__(self, name, val):
+    def __setattr__(self, name: str, val: str):
         """Stops any other strategy altering the methods of this class """
 
         if name == 'strategy':
@@ -85,7 +85,7 @@ class MirrorMindReader(ProtectedMindReader):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         """Will read the mind of the opponent and play the opponent's strategy.
 
         Also avoid infinite recursion when called by itself or another mind

axelrod/strategies/mutual.py

@@ -1,4 +1,4 @@
-from axelrod.actions import Actions
+from axelrod.actions import Actions, Action
 from axelrod.player import Player
 from axelrod.random_ import random_choice
 
@@ -23,7 +23,7 @@ class Desperate(Player):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         if not opponent.history:
             return random_choice()
         if self.history[-1] == D and opponent.history[-1] == D:
@@ -49,7 +49,7 @@ class Hopeless(Player):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         if not opponent.history:
             return random_choice()
         if self.history[-1] == C and opponent.history[-1] == C:
@@ -75,7 +75,7 @@ class Willing(Player):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         if not opponent.history:
             return random_choice()
         if self.history[-1] == D and opponent.history[-1] == D:

axelrod/strategies/negation.py

@@ -1,4 +1,4 @@
-from axelrod.actions import Actions, flip_action
+from axelrod.actions import Actions, flip_action, Action
 from axelrod.player import Player
 from axelrod.random_ import random_choice
 
@@ -26,10 +26,9 @@ class Negation(Player):
         'manipulates_state': False
     }
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         # Random first move
         if not self.history:
             return random_choice()
         # Act opposite of opponent otherwise
         return flip_action(opponent.history[-1])
-

type_tests.sh

@@ -27,6 +27,10 @@ mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/grumpy.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/handshake.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/inverse.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/mathematicalconstants.py
+mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/mindcontrol.py
+mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/mindreader.py
+mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/mutual.py
+mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/negation.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/hunter.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/geller.py
 mypy --ignore-missing-imports --follow-imports skip axelrod/strategies/memorytwo.py