Correct imports for type checking.

Author: drvinceknight

axelrod/_strategy_utils.py

@@ -2,8 +2,8 @@
 import itertools
 from functools import lru_cache
 
-from axelrod import update_history
-from axelrod import Actions
+from axelrod.player import update_history
+from axelrod.actions import Actions
 
 from axelrod.strategies.cycler import Cycler
 

axelrod/interaction_utils.py

@@ -10,7 +10,7 @@
 from collections import Counter
 import csv
 
-from axelrod import Actions
+from axelrod.actions import Actions
 from .game import Game
 
 import tqdm

axelrod/match.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Game
+from axelrod.actions import Actions
+from axelrod.game import Game
 import axelrod.interaction_utils as iu
 from .deterministic_cache import DeterministicCache
 

axelrod/mock_player.py

@@ -1,6 +1,6 @@
 import warnings
-from axelrod import Actions, Player, update_history, update_state_distribution
-from axelrod.actions import Action
+from axelrod.actions import Actions, Action
+from axelrod.player import Player, update_history, update_state_distribution
 from collections import defaultdict
 
 from typing import List, Tuple

axelrod/player.py

@@ -3,7 +3,7 @@
 import random
 import copy
 
-from axelrod import Actions, flip_action
+from axelrod.actions import Actions, flip_action
 from .game import DefaultGame
 
 

axelrod/random_.py

@@ -1,7 +1,6 @@
 import random
 import numpy
-from axelrod import Actions
-from axelrod.actions import Action
+from axelrod.actions import Action, Actions
 
 
 def random_choice(p: float = 0.5) -> Action:

axelrod/strategies/ann.py

@@ -8,7 +8,7 @@
 
 from axelrod.actions import Actions
 from axelrod.player import Player
-from axelrod import load_weights
+from axelrod.load_data_ import load_weights
 
 C, D = Actions.C, Actions.D
 nn_weights = load_weights()

axelrod/strategies/backstabber.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.strategy_transformers import FinalTransformer
 
 C, D = Actions.C, Actions.D

axelrod/strategies/better_and_better.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 from axelrod.actions import Action
 
 C, D = Actions.C, Actions.D

axelrod/strategies/calculator.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from .axelrod_first import Joss
 from axelrod._strategy_utils import detect_cycle
 

axelrod/strategies/cooperator.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/cycler.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player, init_args
+from axelrod.actions import Actions
+from axelrod.player import Player, init_args
 
 import copy
 

axelrod/strategies/darwin.py

@@ -1,5 +1,6 @@
 import inspect
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/defector.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/doubler.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/finite_state_machines.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/forgiver.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.actions import Action
 
 C, D = Actions.C, Actions.D

axelrod/strategies/gambler.py

@@ -5,7 +5,9 @@
  https://gist.github.com/GDKO/60c3d0fd423598f3c4e4
 """
 
-from axelrod import Actions, load_pso_tables, random_choice
+from axelrod.actions import Actions
+from axelrod.load_data_ import load_pso_tables
+from axelrod.random_ import random_choice
 from .lookerup import LookerUp, create_lookup_table_from_pattern
 
 

axelrod/strategies/geller.py

@@ -1,6 +1,8 @@
 import inspect
 
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/gobymajority.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 import copy
 

axelrod/strategies/gradualkiller.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.strategy_transformers import InitialTransformer
 
 C, D = Actions.C, Actions.D

axelrod/strategies/grudger.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/grumpy.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/handshake.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/hmm.py

@@ -1,6 +1,8 @@
 from numpy.random import choice
 
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/human.py

@@ -1,5 +1,6 @@
 from os import linesep
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from prompt_toolkit import prompt
 from prompt_toolkit.token import Token
 from prompt_toolkit.styles import style_from_dict

axelrod/strategies/hunter.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod._strategy_utils import detect_cycle
 
 C, D = Actions.C, Actions.D

axelrod/strategies/inverse.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/lookerup.py

@@ -2,7 +2,9 @@
 from itertools import product
 import sys
 
-from axelrod import Actions, Player, init_args, load_lookerup_tables
+from axelrod.actions import Actions
+from axelrod.player import Player, init_args
+from axelrod.load_data_ import load_lookerup_tables
 
 module = sys.modules[__name__]
 C, D = Actions.C, Actions.D

axelrod/strategies/mathematicalconstants.py

@@ -1,5 +1,6 @@
 import math
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 
 class CotoDeRatio(Player):

axelrod/strategies/memoryone.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 
 C, D = Actions.C, Actions.D

axelrod/strategies/memorytwo.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from .titfortat import TitForTat, TitFor2Tats
 from .defector import Defector
 

axelrod/strategies/meta.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player, obey_axelrod
+from axelrod.actions import Actions
+from axelrod.player import Player, obey_axelrod
 from axelrod.strategy_transformers import NiceTransformer
 from ._strategies import all_strategies
 from .hunter import (

axelrod/strategies/mindcontrol.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/mindreader.py

@@ -1,6 +1,7 @@
 import inspect
 
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod._strategy_utils import look_ahead
 
 

axelrod/strategies/mutual.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D

axelrod/strategies/negation.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice, flip_action
+from axelrod.actions import Actions, flip_action
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/oncebitten.py

@@ -1,5 +1,6 @@
 import random
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/prober.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 import random
 

axelrod/strategies/punisher.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/qlearner.py

@@ -1,7 +1,9 @@
 from collections import OrderedDict
 import random
 
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/rand.py

@@ -1,4 +1,5 @@
-from axelrod import Player, random_choice
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 
 class Random(Player):

axelrod/strategies/retaliate.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
 
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
 

axelrod/strategies/sequence_player.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod._strategy_utils import thue_morse_generator
 
 C, D = Actions.C, Actions.D

axelrod/strategies/titfortat.py

@@ -1,4 +1,5 @@
-from axelrod import Actions, Player
+from axelrod.actions import Actions
+from axelrod.player import Player
 from axelrod.strategy_transformers import TrackHistoryTransformer
 
 C, D = Actions.C, Actions.D

axelrod/strategies/worse_and_worse.py

@@ -1,4 +1,6 @@
-from axelrod import Actions, Player, random_choice
+from axelrod.actions import Actions
+from axelrod.player import Player
+from axelrod.random_ import random_choice
 
 C, D = Actions.C, Actions.D