From 760371e1d6fef34e436d0a1239f339ecc66ac614 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Sun, 23 Aug 2015 23:45:19 +0200 Subject: [PATCH] linux/reicast-joyconfig: Add python2 support --- shell/linux/tools/reicast-joyconfig.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/shell/linux/tools/reicast-joyconfig.py b/shell/linux/tools/reicast-joyconfig.py index 44a1b9934..5e352149c 100755 --- a/shell/linux/tools/reicast-joyconfig.py +++ b/shell/linux/tools/reicast-joyconfig.py @@ -1,6 +1,18 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +from __future__ import print_function + +import sys +import re +import os +if sys.version_info < (3, 0): + import ConfigParser as configparser + INPUT_FUNC = raw_input +else: + import configparser + INPUT_FUNC = input + try: import evdev except ImportError: @@ -8,11 +20,6 @@ except ImportError: print("You can do this via:") print(" pip install evdev") -import re -import configparser -import sys -import os - DEV_ID_PATTERN = re.compile('(\d+)') DREAMCAST_BUTTONS = ['A', 'B', 'C', 'D', 'X', 'Y', 'Z', 'START'] DREAMCAST_DPAD = [('X', 'LEFT', 'RIGHT'), ('Y', 'UP', 'DOWN')] @@ -194,7 +201,7 @@ def ask_yes_no(question, default=True): while True: print("%s [%s] " % (question, prompt), end='') - choice = input().lower() + choice = INPUT_FUNC().lower() if choice == '': return default if choice in valid: