diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 00:12:34 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-09 00:12:34 -0500 |
commit | 5d41f8a91dc47e41f45ecaeec4ad1640196be37e (patch) | |
tree | e7906202e5f1855c90d3d395173f4c399504a7a8 | |
parent | 815266f03fb5de060939a271136caf520921654c (diff) |
move vba_keyboard.py -> keyboard.py
-rw-r--r-- | pokemontools/vba/keyboard.py (renamed from pokemontools/vba/vba_keyboard.py) | 0 | ||||
-rw-r--r-- | pokemontools/vba/vba.py | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pokemontools/vba/vba_keyboard.py b/pokemontools/vba/keyboard.py index f25fd06..f25fd06 100644 --- a/pokemontools/vba/vba_keyboard.py +++ b/pokemontools/vba/keyboard.py diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py index 3e0b7dd..b7c3768 100644 --- a/pokemontools/vba/vba.py +++ b/pokemontools/vba/vba.py @@ -109,10 +109,7 @@ Gb.loadVBA() from vba_config import * -try: - import vba_keyboard as keyboard -except ImportError: - print "Not loading the keyboard module (which uses networkx)." +import keyboard if not os.path.exists(rom_path): raise Exception("rom_path is not configured properly; edit vba_config.py? " + str(rom_path)) |