From 5d41f8a91dc47e41f45ecaeec4ad1640196be37e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 9 Sep 2013 00:12:34 -0500 Subject: [PATCH] move vba_keyboard.py -> keyboard.py --- pokemontools/vba/{vba_keyboard.py => keyboard.py} | 0 pokemontools/vba/vba.py | 5 +---- 2 files changed, 1 insertion(+), 4 deletions(-) rename pokemontools/vba/{vba_keyboard.py => keyboard.py} (100%) diff --git a/pokemontools/vba/vba_keyboard.py b/pokemontools/vba/keyboard.py similarity index 100% rename from pokemontools/vba/vba_keyboard.py rename to 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))