Python 2 related fixes

gvalkov · gvalkov · commit 8bf397bd447d · 2016-06-04T13:07:57.000+02:00
diff --git a/evdev/evtest.py b/evdev/evtest.py
@@ -29,6 +29,11 @@
 import termios
 import optparse
 
+try:
+    input = raw_input
+except NameError:
+    pass
+
 from evdev import ecodes, list_devices, AbsInfo, InputDevice
 
 
@@ -105,6 +110,9 @@ def devicenum(device_path):
         choices = choices.split()
         choices = [devices[int(num)] for num in choices]
     except ValueError:
+        choices = None
+
+    if not choices:
         msg = 'error: invalid input - please enter one or more numbers separated by spaces'
         print(msg, file=sys.stderr)
         sys.exit(1)
diff --git a/setup.py b/setup.py
@@ -112,16 +112,17 @@ class cmdbuild_ext(build_ext.build_ext):
 
     def initialize_options(self):
         self.evdev_headers = None
-        super(cmdbuild_ext, self).initialize_options()
+        # We cannot use super(cmdbuild_ext, self) here for compatibility with Py2.
+        build_ext.build_ext.initialize_options(self)
 
     def finalize_options(self):
         if self.evdev_headers:
             self.evdev_headers = self.evdev_headers.split(':')
-        super(cmdbuild_ext, self).finalize_options()
+        build_ext.build_ext.finalize_options(self)
 
     def run(self):
         create_ecodes(self.evdev_headers)
-        super(cmdbuild_ext, self).run()
+        build_ext.build_ext.run(self)
 
 #-----------------------------------------------------------------------------
 kw['cmdclass']['build_ext'] = cmdbuild_ext
