Merge pull request #2 from jodal/patch-1

tox: Don't need to install to run flake8
This commit is contained in:
9and3r
2015-03-24 11:55:35 +01:00
3 changed files with 9 additions and 6 deletions

View File

@@ -87,7 +87,8 @@ class ListView():
self.move_to(direction)
else:
return int(key)
elif touch_event.type == InputManager.key and self.selected is not None:
elif (touch_event.type == InputManager.key and
self.selected is not None):
if touch_event.direction == InputManager.enter:
if self.selected is not None:
return self.selected

View File

@@ -25,18 +25,19 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
self.fullscreen = config['touchscreen']['fullscreen']
self.screen_size = (config['touchscreen']['screen_width'],
config['touchscreen']['screen_height'])
if config['touchscreen']['sdl_fbdev'].lower() != "none":
os.environ["SDL_FBDEV"] = config['touchscreen']['sdl_fbdev']
if config['touchscreen']['sdl_mousdrv'].lower() != "none":
os.environ["SDL_MOUSEDRV"] = config['touchscreen'][
'sdl_mousdrv']
os.environ["SDL_MOUSEDRV"] = (
config['touchscreen']['sdl_mousdrv'])
if config['touchscreen']['sdl_mousedev'].lower() != "none":
os.environ["SDL_MOUSEDEV"] = config['touchscreen']['sdl_mousedev']
if config['touchscreen']['sdl_audiodriver'].lower() != "none":
os.environ["SDL_AUDIODRIVER"] = config['touchscreen']['sdl_audiodriver']
os.environ["SDL_AUDIODRIVER"] = (
config['touchscreen']['sdl_audiodriver'])
os.environ["SDL_PATH_DSP"] = config['touchscreen']['sdl_path_dsp']
pygame.init()

View File

@@ -15,4 +15,5 @@ commands = nosetests -v --with-xunit --xunit-file=xunit-{envname}.xml --with-cov
deps =
flake8
flake8-import-order
commands = flake8
skip_install = true
commands = flake8