From ff4eb4e9e5e5453fce5fa44809505d086dcd3423 Mon Sep 17 00:00:00 2001 From: gen2brain Date: Mon, 2 Dec 2013 01:27:29 +0100 Subject: [PATCH] don't import all from SDL --- src/m64py/frontend/input.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/m64py/frontend/input.py b/src/m64py/frontend/input.py index 6711498..f8496d0 100644 --- a/src/m64py/frontend/input.py +++ b/src/m64py/frontend/input.py @@ -27,9 +27,9 @@ from m64py.frontend.keymap import QT2SDL, SCANCODE2KEYCODE, KEYCODE2SCANCODE from m64py.ui.input_ui import Ui_InputDialog if SDL2: - from m64py.SDL2 import * + from m64py.SDL2 import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO else: - from m64py.SDL import * + from m64py.SDL import SDL_WasInit, SDL_InitSubSystem, SDL_QuitSubSystem, SDL_INIT_VIDEO KEY_RE = re.compile("([a-z]+)\((.*)\)") AXIS_RE = re.compile("([a-z]+)\((.*?),(.*?)\)") @@ -385,6 +385,7 @@ class Input(QDialog, Ui_InputDialog): except: return "Select..." else: + from m64py.SDL.keyboard import SDL_GetKeyName text = SDL_GetKeyName(int(sdl_key)).title() if not text: return "Select..."