korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 07:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

simple-agent: Fix input with python version < 3.0

Browse Source 
input() in python < 3.0 is the same as eval(raw_input()) which is not
what we want. With python >= 3.0 in turn raw_input doesn't exist. This
patch fixes support for both versions by a simple try-except clause.
This commit is contained in:
Johan Hedberg 2012-06-18 14:07:30 +03:00
parent 9d2f3c94d6
commit 5c9af79845
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/simple-agent
View File

@ -10,6 +10,12 @@ import dbus.service
import dbus.mainloop.glib
from optparse import OptionParser
def ask(prompt):
try:
return raw_input(prompt)
except:
return input(prompt)
class Rejected(dbus.DBusException):
_dbus_error_name = "org.bluez.Error.Rejected"
@ -30,7 +36,7 @@ class Agent(dbus.service.Object):
in_signature="os", out_signature="")
def Authorize(self, device, uuid):
print("Authorize (%s, %s)" % (device, uuid))
authorize = input("Authorize connection (yes/no): ")
authorize = ask("Authorize connection (yes/no): ")
if (authorize == "yes"):
return
raise Rejected("Connection rejected by user")
@ -39,13 +45,13 @@ class Agent(dbus.service.Object):
in_signature="o", out_signature="s")
def RequestPinCode(self, device):
print("RequestPinCode (%s)" % (device))
return input("Enter PIN Code: ")
return ask("Enter PIN Code: ")
@dbus.service.method("org.bluez.Agent",
in_signature="o", out_signature="u")
def RequestPasskey(self, device):
print("RequestPasskey (%s)" % (device))
passkey = input("Enter passkey: ")
passkey = ask("Enter passkey: ")
return dbus.UInt32(passkey)
@dbus.service.method("org.bluez.Agent",
@ -62,7 +68,7 @@ class Agent(dbus.service.Object):
in_signature="ou", out_signature="")
def RequestConfirmation(self, device, passkey):
print("RequestConfirmation (%s, %06d)" % (device, passkey))
confirm = input("Confirm passkey (yes/no): ")
confirm = ask("Confirm passkey (yes/no): ")
if (confirm == "yes"):
return
raise Rejected("Passkey doesn't match")
@ -71,7 +77,7 @@ class Agent(dbus.service.Object):
in_signature="s", out_signature="")
def ConfirmModeChange(self, mode):
print("ConfirmModeChange (%s)" % (mode))
authorize = input("Authorize mode change (yes/no): ")
authorize = ask("Authorize mode change (yes/no): ")
if (authorize == "yes"):
return
raise Rejected("Mode change by user")