summarylogtreecommitdiffstats
path: root/xboxdrvctl-py3.patch
blob: 71d8762cb9ca520629eef7c684e802163e90dce1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
--- a/xboxdrvctl	2021-06-21 19:39:51.000000000 -0400
+++ b/xboxdrvctl 19:43:27.467984928 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 ##  Xbox360 USB Gamepad Userspace Driver
 ##  Copyright (C) 2011 Ingo Ruhnke <grumbel@gmail.com>
@@ -37,23 +37,23 @@
                   help="print controller status")
 
 group.add_option("-s", "--slot", metavar="SLOT", type="int",
-                  dest="slot", 
+                  dest="slot",
                   help="use slot SLOT for actions")
 
 group.add_option("-l", "--led", metavar="NUM", type="int",
-                  dest="led", 
+                  dest="led",
                   help="set LED")
 
-group.add_option("-r", "--rumble", metavar="L:R", 
-                  dest="rumble", 
+group.add_option("-r", "--rumble", metavar="L:R",
+                  dest="rumble",
                   help="print controller status")
 
 group.add_option("-c", "--config", metavar="NUM", type="int",
-                  dest="config", 
+                  dest="config",
                   help="switches to controller configuration NUM")
 
 group.add_option("--shutdown", action="store_true",
-                  dest="shutdown", 
+                  dest="shutdown",
                   help="shuts down the daemon")
 
 parser.add_option_group(group)
@@ -69,9 +69,9 @@
     try:
         bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon')
     except dbus.exceptions.DBusException:
-				bus = dbus.SystemBus()
+        bus = dbus.SystemBus()
 else:
-    print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'"
+    print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'")
     exit()
 
 if options.status:
@@ -82,19 +82,19 @@
     daemon.Shutdown()
 else:
     if (options.led or options.rumble or options.config) and options.slot == None:
-        print "Error: --slot argument required"
+        print("Error: --slot argument required")
         exit()
     else:
         if options.slot != None:
             slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot)
-    
+
             if options.led != None:
                 slot.SetLed(options.led)
 
             if options.rumble:
                 m = re.match('^(\d+):(\d+)$', options.rumble)
                 if not m:
-                    print "Error: invalid argument to --rumble"
+                    print("Error: invalid argument to --rumble")
                     exit()
                 else:
                     left  = int(m.group(1))