Style fixes

A bunch of style fixes. Mostly white space and style import order
tweaks, but a few other stylistic changes are present too.

Main.py

@@ -1,18 +1,18 @@
+from collections import OrderedDict
+import json
+import logging
+import random
+import time
+
 from BaseClasses import World, CollectionState, Item
 from Regions import create_regions, mark_light_world_regions
 from EntranceShuffle import link_entrances
 from Rom import patch_rom, Sprite, LocalRom, JsonRom
 from Rules import set_rules
 from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
-from Items import ItemFactory
-from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, fill_restrictive, flood_items
-from collections import OrderedDict
+from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items
 from ItemList import generate_itempool
 from Utils import output_path
-import random
-import time
-import logging
-import json
 
 __version__ = '0.5.1-dev'
 
@@ -39,7 +39,7 @@ def main(args, seed=None):
         world.seed = int(seed)
     random.seed(world.seed)
 
-    logger.info('ALttP Entrance Randomizer Version %s  -  Seed: %s\n\n' % (__version__, world.seed))
+    logger.info('ALttP Entrance Randomizer Version %s  -  Seed: %s\n\n', __version__, world.seed)
 
     create_regions(world)
 
@@ -92,7 +92,7 @@ def main(args, seed=None):
     logger.info('Patching ROM.')
 
     if args.sprite is not None:
-        if isinstance(args.sprite,Sprite):
+        if isinstance(args.sprite, Sprite):
             sprite = args.sprite
         else:
             sprite = Sprite(args.sprite)
@@ -116,7 +116,7 @@ def main(args, seed=None):
         world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase))
 
     logger.info('Done. Enjoy.')
-    logger.debug('Total Time: %s' % (time.clock() - start))
+    logger.debug('Total Time: %s', time.clock() - start)
 
     return world
 
@@ -199,10 +199,10 @@ def create_playthrough(world):
 
         collection_spheres.append(sphere)
 
-        logging.getLogger('').debug('Calculated sphere %i, containing %i of %i progress items.' % (len(collection_spheres), len(sphere), len(prog_locations)))
+        logging.getLogger('').debug('Calculated sphere %i, containing %i of %i progress items.', len(collection_spheres), len(sphere), len(prog_locations))
 
         if not sphere:
-            logging.getLogger('').debug('The following items could not be reached: %s' % ['%s at %s' % (location.item.name, location.name) for location in sphere_candidates])
+            logging.getLogger('').debug('The following items could not be reached: %s', ['%s at %s' % (location.item.name, location.name) for location in sphere_candidates])
             if not world.check_beatable_only:
                 raise RuntimeError('Not all progression items reachable. Something went terribly wrong here.')
             else:
@@ -213,11 +213,10 @@ def create_playthrough(world):
         to_delete = []
         for location in sphere:
             # we remove the item at location and check if game is still beatable
-            logging.getLogger('').debug('Checking if %s is required to beat the game.' % location.item.name)
+            logging.getLogger('').debug('Checking if %s is required to beat the game.', location.item.name)
             old_item = location.item
             location.item = None
             state.remove(old_item)
-            world._item_cache = {}  # need to invalidate
             if world.can_beat_game():
                 to_delete.append(location)
             else: