Merge lp:~vorlon/ubuntu/quantal/bluez/python3 into lp:ubuntu/quantal/bluez

[Steve Langasek]

Let's get the python3 started!

[Mathieu Trudel-Lapierre (cyphermox)]

Why do you need my review for this? ;)

Sure, looks good to me. I also see no reason not to update these scripts to python3 now, and I'll take care of the bluez merge to 4.99 soon.

review: Approve

[Barry Warsaw (barry)]

On Apr 27, 2012, at 03:39 AM, Steve Langasek wrote:

>Steve Langasek has proposed merging lp:~vorlon/ubuntu/quantal/bluez/python3 into lp:ubuntu/bluez.
>
>Requested reviews:
> Mathieu Trudel-Lapierre (mathieu-tl)
> Barry Warsaw (barry)
>
>For more details, see:
>https://code.launchpad.net/~vorlon/ubuntu/quantal/bluez/python3/+merge/103795
>
>Let's get the python3 started!

Reviewing quilt patches hurts my brain, but let's see if I got it right. I'll
cut out the parts that look fine.

+Index: trunk/test/simple-agent
+===================================================================
+--- trunk.orig/test/simple-agent
++++ trunk/test/simple-agent
+@@ -1,6 +1,6 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+-import gobject
++from gi.repository import GObject
+
+ import sys
+ import dbus
+@@ -20,14 +20,14 @@
+ @dbus.service.method("org.bluez.Agent",
+ in_signature="", out_signature="")
+ def Release(self):
+- print "Release"
++ print("Release")
+ if self.exit_on_release:
+ mainloop.quit()
+
+ @dbus.service.method("org.bluez.Agent",
+ in_signature="os", out_signature="")
+ def Authorize(self, device, uuid):
+- print "Authorize (%s, %s)" % (device, uuid)
++ print("Authorize (%s, %s)" % (device, uuid))
+ authorize = raw_input("Authorize connection (yes/no): ")

s/raw_input/input/

Python 3 has no raw_input(). Search the patch for other instances of
raw_input().

+Index: trunk/test/test-adapter
+===================================================================
+--- trunk.orig/test/test-adapter
++++ trunk/test/test-adapter
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+ import sys
+ import dbus
+@@ -26,28 +26,28 @@
+ "org.bluez.Adapter")
+
+ if (len(args) < 1):

Note that the outer parentheses are unnecessary and actually rather
un-Pythonic. Conditionals in Python don't need them. (Yep, I know that
Steve's patch doesn't touch this; I've seen this as a general coding style in
bluez, and it bugs me too much not to comment ;).

+Index: trunk/test/test-service
+===================================================================
+--- trunk.orig/test/test-service
++++ trunk/test/test-service
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+
+ import sys
+ import dbus
+@@ -26,22 +26,22 @@
+ "org.bluez.Service")
+
+ if (len(args) < 1):
+- print "Usage: %s <command>" % (sys.argv[0])
+- print ""
+- print " addrecord <file>"
++ print("Usage: %s <command>" % (sys.argv[0]))
++ print("")
++ print(" addrecord <file>")
+ sys.exit(1)
+
+ if (args[0] == "addrecord"):
+ if (len(args) < 2):
+- print "Need file parameter"
++ print("Need file parameter")
+ else:
+ f = open(args[1])
+ record = f.read()
+ f.close()

You might consider using a with-statement here:

            with open(args[1]) as f:
                record = f.read()

then the f.close() happens automatically, even if you get an exception during
the read.

+@@ -141,36 +141,36 @@
+ if len(args) > 1:
+ test.SignalStrength(args[1])
+ else:
+- print "Need signal strength parameter"
++ print("Need signal strength parameter")
+ sys.exit(0)
+
+ if args[0] == "battery":
+ if len(args) > 1:
+ test.BatteryLevel(args[1]...

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-03-21 15:27:57 +0000
+++ .pc/applied-patches	2012-04-27 03:38:31 +0000
@@ -7,3 +7,4 @@
 enable_audio_profiles.patch
 10-unregister_interface_on_exit.patch
 11-explicitly_close.patch
+python3.patch

=== added directory '.pc/python3.patch'
=== added directory '.pc/python3.patch/test'
=== added file '.pc/python3.patch/test/list-devices'
--- .pc/python3.patch/test/list-devices	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/list-devices	2012-04-27 03:38:31 +0000
@@ -0,0 +1,93 @@
+#!/usr/bin/python
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+def extract_objects(object_list):
+	list = ""
+	for object in object_list:
+		val = str(object)
+		list = list + val[val.rfind("/") + 1:] + " "
+	return list
+
+def extract_uuids(uuid_list):
+	list = ""
+	for uuid in uuid_list:
+		if (uuid.endswith("-0000-1000-8000-00805f9b34fb")):
+			if (uuid.startswith("0000")):
+				val = "0x" + uuid[4:8]
+			else:
+				val = "0x" + uuid[0:8]
+		else:
+			val = str(uuid)
+		list = list + val + " "
+	return list
+
+adapter_list = manager.ListAdapters()
+
+for i in adapter_list:
+	adapter = dbus.Interface(bus.get_object("org.bluez", i),
+							"org.bluez.Adapter")
+	print "[ " + i + " ]"
+
+	properties  = adapter.GetProperties()
+	for key in properties.keys():
+		value = properties[key]
+		if (key == "Devices"):
+			list = extract_objects(value)
+			print "    %s = %s" % (key, list)
+		elif (key == "UUIDs"):
+			list = extract_uuids(value)
+			print "    %s = %s" % (key, list)
+		else:
+			print "    %s = %s" % (key, value)
+
+	try:
+		device_list = properties["Devices"]
+	except:
+		device_list = []
+
+	for n in device_list:
+		device = dbus.Interface(bus.get_object("org.bluez", n),
+							"org.bluez.Device")
+		print "    [ " + n + " ]"
+
+		properties = device.GetProperties()
+		for key in properties.keys():
+			value = properties[key]
+			if (key == "Nodes"):
+				list = extract_objects(value)
+				print "        %s = %s" % (key, list)
+			elif (key == "UUIDs"):
+				list = extract_uuids(value)
+				print "        %s = %s" % (key, list)
+			elif (key == "Class"):
+				print "        %s = 0x%06x" % (key, value)
+			elif (key == "Vendor"):
+				print "        %s = 0x%04x" % (key, value)
+			elif (key == "Product"):
+				print "        %s = 0x%04x" % (key, value)
+			elif (key == "Version"):
+				print "        %s = 0x%04x" % (key, value)
+			else:
+				print "        %s = %s" % (key, value)
+
+		try:
+			node_list = properties["Nodes"]
+		except:
+			node_list = []
+
+		for x in node_list:
+			node = dbus.Interface(bus.get_object("org.bluez", x),
+							"org.bluez.Node")
+			print "        [ " + x + " ]"
+
+			properties = node.GetProperties()
+			for key in properties.keys():
+				print "            %s = %s" % (key, properties[key])
+
+	print

=== added file '.pc/python3.patch/test/monitor-bluetooth'
--- .pc/python3.patch/test/monitor-bluetooth	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/monitor-bluetooth	2012-04-27 03:38:31 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+import gobject
+
+import dbus
+import dbus.mainloop.glib
+
+def property_changed(name, value, path, interface):
+	iface = interface[interface.rfind(".") + 1:]
+	val = str(value)
+	print "{%s.PropertyChanged} [%s] %s = %s" % (iface, path, name, val)
+
+def object_signal(value, path, interface, member):
+	iface = interface[interface.rfind(".") + 1:]
+	val = str(value)
+	print "{%s.%s} [%s] Path = %s" % (iface, member, path, val)
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	bus.add_signal_receiver(property_changed, bus_name="org.bluez",
+					signal_name = "PropertyChanged",
+						path_keyword="path",
+						interface_keyword="interface")
+
+	bus.add_signal_receiver(object_signal, bus_name="org.bluez",
+					signal_name = "AdapterAdded",
+						path_keyword="path",
+						member_keyword="member",
+						interface_keyword="interface")
+	bus.add_signal_receiver(object_signal, bus_name="org.bluez",
+					signal_name = "AdapterRemoved",
+						path_keyword="path",
+						member_keyword="member",
+						interface_keyword="interface")
+	bus.add_signal_receiver(object_signal, bus_name="org.bluez",
+					signal_name = "DefaultAdapterChanged",
+						path_keyword="path",
+						member_keyword="member",
+						interface_keyword="interface")
+
+	bus.add_signal_receiver(object_signal, bus_name="org.bluez",
+					signal_name = "DeviceCreated",
+						path_keyword="path",
+						member_keyword="member",
+						interface_keyword="interface")
+	bus.add_signal_receiver(object_signal, bus_name="org.bluez",
+					signal_name = "DeviceRemoved",
+						path_keyword="path",
+						member_keyword="member",
+						interface_keyword="interface")
+
+	mainloop = gobject.MainLoop()
+	mainloop.run()

=== added file '.pc/python3.patch/test/simple-agent'
--- .pc/python3.patch/test/simple-agent	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/simple-agent	2012-04-27 03:38:31 +0000
@@ -0,0 +1,130 @@
+#!/usr/bin/python
+
+import gobject
+
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+from optparse import OptionParser
+
+class Rejected(dbus.DBusException):
+	_dbus_error_name = "org.bluez.Error.Rejected"
+
+class Agent(dbus.service.Object):
+	exit_on_release = True
+
+	def set_exit_on_release(self, exit_on_release):
+		self.exit_on_release = exit_on_release
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="", out_signature="")
+	def Release(self):
+		print "Release"
+		if self.exit_on_release:
+			mainloop.quit()
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="os", out_signature="")
+	def Authorize(self, device, uuid):
+		print "Authorize (%s, %s)" % (device, uuid)
+		authorize = raw_input("Authorize connection (yes/no): ")
+		if (authorize == "yes"):
+			return
+		raise Rejected("Connection rejected by user")
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="o", out_signature="s")
+	def RequestPinCode(self, device):
+		print "RequestPinCode (%s)" % (device)
+		return raw_input("Enter PIN Code: ")
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="o", out_signature="u")
+	def RequestPasskey(self, device):
+		print "RequestPasskey (%s)" % (device)
+		passkey = raw_input("Enter passkey: ")
+		return dbus.UInt32(passkey)
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="ou", out_signature="")
+	def DisplayPasskey(self, device, passkey):
+		print "DisplayPasskey (%s, %d)" % (device, passkey)
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="ou", out_signature="")
+	def RequestConfirmation(self, device, passkey):
+		print "RequestConfirmation (%s, %d)" % (device, passkey)
+		confirm = raw_input("Confirm passkey (yes/no): ")
+		if (confirm == "yes"):
+			return
+		raise Rejected("Passkey doesn't match")
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="s", out_signature="")
+	def ConfirmModeChange(self, mode):
+		print "ConfirmModeChange (%s)" % (mode)
+		authorize = raw_input("Authorize mode change (yes/no): ")
+		if (authorize == "yes"):
+			return
+		raise Rejected("Mode change by user")
+
+	@dbus.service.method("org.bluez.Agent",
+					in_signature="", out_signature="")
+	def Cancel(self):
+		print "Cancel"
+
+def create_device_reply(device):
+	print "New device (%s)" % (device)
+	mainloop.quit()
+
+def create_device_error(error):
+	print "Creating device failed: %s" % (error)
+	mainloop.quit()
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+							"org.bluez.Manager")
+
+	capability = "DisplayYesNo"
+
+	parser = OptionParser()
+	parser.add_option("-c", "--capability", action="store",
+					type="string", dest="capability")
+	(options, args) = parser.parse_args()
+	if options.capability:
+		capability  = options.capability
+
+	if len(args) > 0:
+		path = manager.FindAdapter(args[0])
+	else:
+		path = manager.DefaultAdapter()
+
+	adapter = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Adapter")
+
+	path = "/test/agent"
+	agent = Agent(bus, path)
+
+	mainloop = gobject.MainLoop()
+
+	if len(args) > 1:
+		if len(args) > 2:
+			device = adapter.FindDevice(args[1])
+			adapter.RemoveDevice(device)
+
+		agent.set_exit_on_release(False)
+		adapter.CreatePairedDevice(args[1], path, capability,
+					reply_handler=create_device_reply,
+					error_handler=create_device_error)
+	else:
+		adapter.RegisterAgent(path, capability)
+		print "Agent registered"
+
+	mainloop.run()
+
+	#adapter.UnregisterAgent(path)
+	#print "Agent unregistered"

=== added file '.pc/python3.patch/test/simple-endpoint'
--- .pc/python3.patch/test/simple-endpoint	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/simple-endpoint	2012-04-27 03:38:31 +0000
@@ -0,0 +1,126 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+import gobject
+
+A2DP_SOURCE_UUID = "0000110A-0000-1000-8000-00805F9B34FB"
+A2DP_SINK_UUID = "0000110B-0000-1000-8000-00805F9B34FB"
+HFP_AG_UUID = "0000111F-0000-1000-8000-00805F9B34FB"
+HSP_AG_UUID = "00001112-0000-1000-8000-00805F9B34FB"
+
+SBC_CODEC = dbus.Byte(0x00)
+#Channel Modes: Mono DualChannel Stereo JointStereo
+#Frequencies: 16Khz 32Khz 44.1Khz 48Khz
+#Subbands: 4 8
+#Blocks: 4 8 12 16
+#Bitpool Range: 2-64
+SBC_CAPABILITIES = dbus.Array([dbus.Byte(0xff), dbus.Byte(0xff), dbus.Byte(2), dbus.Byte(64)])
+# JointStereo 44.1Khz Subbands: Blocks: 16 Bitpool Range: 2-32
+SBC_CONFIGURATION = dbus.Array([dbus.Byte(0x21), dbus.Byte(0x15), dbus.Byte(2), dbus.Byte(32)])
+
+MP3_CODEC = dbus.Byte(0x01)
+#Channel Modes: Mono DualChannel Stereo JointStereo
+#Frequencies: 32Khz 44.1Khz 48Khz
+#CRC: YES
+#Layer: 3
+#Bit Rate: All except Free format
+#VBR: Yes
+#Payload Format: RFC-2250
+MP3_CAPABILITIES = dbus.Array([dbus.Byte(0x3f), dbus.Byte(0x07), dbus.Byte(0xff), dbus.Byte(0xfe)])
+# JointStereo 44.1Khz Layer: 3 Bit Rate: VBR Format: RFC-2250
+MP3_CONFIGURATION = dbus.Array([dbus.Byte(0x21), dbus.Byte(0x02), dbus.Byte(0x00), dbus.Byte(0x80)])
+
+PCM_CODEC = dbus.Byte(0x00)
+PCM_CONFIGURATION = dbus.Array([], signature="ay")
+
+class Rejected(dbus.DBusException):
+	_dbus_error_name = "org.bluez.Error.Rejected"
+
+class Endpoint(dbus.service.Object):
+	exit_on_release = True
+	configuration = SBC_CONFIGURATION
+
+	def set_exit_on_release(self, exit_on_release):
+		self.exit_on_release = exit_on_release
+
+	def default_configuration(self, configuration):
+		self.configuration = configuration
+
+	@dbus.service.method("org.bluez.MediaEndpoint",
+					in_signature="", out_signature="")
+	def Release(self):
+		print "Release"
+		if self.exit_on_release:
+			mainloop.quit()
+
+	@dbus.service.method("org.bluez.MediaEndpoint",
+					in_signature="", out_signature="")
+	def ClearConfiguration(self):
+		print "ClearConfiguration"
+
+	@dbus.service.method("org.bluez.MediaEndpoint",
+					in_signature="oay", out_signature="")
+	def SetConfiguration(self, transport, config):
+		print "SetConfiguration (%s, %s)" % (transport, config)
+		return
+
+	@dbus.service.method("org.bluez.MediaEndpoint",
+					in_signature="ay", out_signature="ay")
+	def SelectConfiguration(self, caps):
+		print "SelectConfiguration (%s)" % (caps)
+		return self.configuration
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+	if len(sys.argv) > 1:
+		path = manager.FindAdapter(sys.argv[1])
+	else:
+		path = manager.DefaultAdapter()
+
+	media = dbus.Interface(bus.get_object("org.bluez", path),
+						"org.bluez.Media")
+
+	path = "/test/endpoint"
+	endpoint = Endpoint(bus, path)
+	mainloop = gobject.MainLoop()
+
+	properties = dbus.Dictionary({ "UUID" : A2DP_SOURCE_UUID,
+					"Codec" : SBC_CODEC,
+					"DelayReporting" : True,
+					"Capabilities" : SBC_CAPABILITIES })
+
+	if len(sys.argv) > 2:
+		if sys.argv[2] == "sbcsink":
+			properties = dbus.Dictionary({ "UUID" : A2DP_SINK_UUID,
+							"Codec" : SBC_CODEC,
+							"DelayReporting" : True,
+							"Capabilities" : SBC_CAPABILITIES })
+		if sys.argv[2] == "mp3source":
+			properties = dbus.Dictionary({ "UUID" : A2DP_SOURCE_UUID,
+							"Codec" : MP3_CODEC,
+							"Capabilities" : MP3_CAPABILITIES })
+			endpoint.default_configuration(MP3_CONFIGURATION)
+		if sys.argv[2] == "mp3sink":
+			properties = dbus.Dictionary({ "UUID" : A2DP_SINK_UUID,
+							"Codec" : MP3_CODEC,
+							"Capabilities" : MP3_CAPABILITIES })
+			endpoint.default_configuration(MP3_CONFIGURATION)
+		if sys.argv[2] == "hfpag" or sys.argv[2] == "hspag":
+			properties = dbus.Dictionary({ "UUID" : HFP_AG_UUID,
+							"Codec" : PCM_CODEC,
+							"Capabilities" :  PCM_CONFIGURATION })
+			endpoint.default_configuration(dbus.Array([]))
+
+	print properties
+
+	media.RegisterEndpoint(path, properties)
+
+	mainloop.run()

=== added file '.pc/python3.patch/test/simple-service'
--- .pc/python3.patch/test/simple-service	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/simple-service	2012-04-27 03:38:31 +0000
@@ -0,0 +1,127 @@
+#!/usr/bin/python
+
+import sys
+import time
+import dbus
+
+xml = ' \
+<?xml version="1.0" encoding="UTF-8" ?> 	\
+<record>					\
+  <attribute id="0x0001">			\
+    <sequence>					\
+      <uuid value="0x1101"/>			\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x0002">			\
+     <uint32 value="0"/>			\
+  </attribute>					\
+						\
+  <attribute id="0x0003">			\
+    <uuid value="00001101-0000-1000-8000-00805f9b34fb"/> \
+  </attribute>					\
+						\
+  <attribute id="0x0004">			\
+    <sequence>					\
+      <sequence>				\
+        <uuid value="0x0100"/>			\
+      </sequence>				\
+      <sequence>				\
+        <uuid value="0x0003"/>			\
+        <uint8 value="23"/>			\
+      </sequence>				\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x0005">			\
+    <sequence>					\
+      <uuid value="0x1002"/>			\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x0006">			\
+    <sequence>					\
+      <uint16 value="0x656e"/>			\
+      <uint16 value="0x006a"/>			\
+      <uint16 value="0x0100"/>			\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x0007">			\
+     <uint32 value="0"/>			\
+  </attribute>					\
+						\
+  <attribute id="0x0008">			\
+     <uint8 value="0xff"/>			\
+  </attribute>					\
+						\
+  <attribute id="0x0009">			\
+    <sequence>					\
+      <sequence>				\
+        <uuid value="0x1101"/>			\
+        <uint16 value="0x0100"/>		\
+      </sequence>				\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x000a">			\
+    <url value="http://www.bluez.org/"/>	\
+  </attribute>					\
+						\
+  <attribute id="0x000b">			\
+    <url value="http://www.bluez.org/"/>	\
+  </attribute>					\
+						\
+  <attribute id="0x000c">			\
+    <url value="http://www.bluez.org/"/>	\
+  </attribute>					\
+						\
+  <attribute id="0x0100">			\
+    <text value="Serial Port"/>			\
+  </attribute>					\
+						\
+  <attribute id="0x0101">			\
+    <text value="Serial Port Service"/>		\
+  </attribute>					\
+						\
+  <attribute id="0x0102">			\
+     <text value="BlueZ"/>			\
+  </attribute>					\
+						\
+  <attribute id="0x0200">			\
+    <sequence>					\
+      <uint16 value="0x0100"/>			\
+    </sequence>					\
+  </attribute>					\
+						\
+  <attribute id="0x0201">			\
+     <uint32 value="0"/>			\
+  </attribute>					\
+</record>					\
+'
+
+bus = dbus.SystemBus()
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+if len(sys.argv) > 1:
+	path = manager.FindAdapter(sys.argv[1])
+else:
+	path = manager.DefaultAdapter()
+
+service = dbus.Interface(bus.get_object("org.bluez", path),
+						"org.bluez.Service")
+
+handle = service.AddRecord(xml)
+
+print "Service record with handle 0x%04x added" % (handle)
+
+print "Press CTRL-C to remove service record"
+
+try:
+	time.sleep(1000)
+	print "Terminating session"
+except:
+	pass
+
+service.RemoveRecord(dbus.UInt32(handle))

=== added file '.pc/python3.patch/test/test-adapter'
--- .pc/python3.patch/test/test-adapter	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-adapter	2012-04-27 03:38:31 +0000
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+import time
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <command>" % (sys.argv[0])
+	print ""
+	print "  address"
+	print "  list"
+	print "  name [name]"
+	print "  powered [on/off]"
+	print "  pairable [on/off]"
+	print "  pairabletimeout [timeout]"
+	print "  discoverable [on/off]"
+	print "  discoverabletimeout [timeout]"
+	print "  discovering"
+	sys.exit(1)
+
+if (args[0] == "address"):
+	properties = adapter.GetProperties()
+	print properties["Address"]
+	sys.exit(0)
+
+if (args[0] == "name"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["Name"]
+	else:
+		adapter.SetProperty("Name", args[1])
+	sys.exit(0)
+
+if (args[0] == "list"):
+	if (len(args) < 2):
+		properties = manager.GetProperties()
+		for adapter_path in properties["Adapters"]:
+			adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+								"org.bluez.Adapter")
+			prop = adapter.GetProperties()
+			print " [ %s ]" % (adapter_path)
+			for (key, value) in prop.iteritems():
+				if (key == "Class"):
+					print "    %s = 0x%06x" % (key, value)
+				else:
+					print "    %s = %s" % (key, value)
+			print
+	sys.exit(0)
+
+if (args[0] == "powered"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["Powered"]
+	else:
+		if (args[1] == "on"):
+			value = dbus.Boolean(1)
+		elif (args[1] == "off"):
+			value = dbus.Boolean(0)
+		else:
+			value = dbus.Boolean(args[1])
+		adapter.SetProperty("Powered", value)
+	sys.exit(0)
+
+if (args[0] == "pairable"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["Pairable"]
+	else:
+		if (args[1] == "on"):
+			value = dbus.Boolean(1)
+		elif (args[1] == "off"):
+			value = dbus.Boolean(0)
+		else:
+			value = dbus.Boolean(args[1])
+		adapter.SetProperty("Pairable", value)
+	sys.exit(0)
+
+if (args[0] == "pairabletimeout"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["PairableTimeout"]
+	else:
+		timeout = dbus.UInt32(args[1])
+		adapter.SetProperty("PairableTimeout", timeout)
+	sys.exit(0)
+
+if (args[0] == "discoverable"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["Discoverable"]
+	else:
+		if (args[1] == "on"):
+			value = dbus.Boolean(1)
+		elif (args[1] == "off"):
+			value = dbus.Boolean(0)
+		else:
+			value = dbus.Boolean(args[1])
+		adapter.SetProperty("Discoverable", value)
+	sys.exit(0)
+
+if (args[0] == "discoverabletimeout"):
+	if (len(args) < 2):
+		properties = adapter.GetProperties()
+		print properties["DiscoverableTimeout"]
+	else:
+		timeout = dbus.UInt32(args[1])
+		adapter.SetProperty("DiscoverableTimeout", timeout)
+	sys.exit(0)
+
+if (args[0] == "discovering"):
+	properties = adapter.GetProperties()
+	print properties["Discovering"]
+	sys.exit(0)
+
+print "Unknown command"
+sys.exit(1)

=== added file '.pc/python3.patch/test/test-attrib'
--- .pc/python3.patch/test/test-attrib	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-attrib	2012-04-27 03:38:31 +0000
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+# Script for testing the Attribute D-Bus API
+
+import sys
+from optparse import OptionParser, OptionValueError
+from binascii import hexlify, unhexlify
+
+import gobject
+
+import sys
+import dbus
+import dbus.mainloop.glib
+from optparse import OptionParser, make_option
+
+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+bus = dbus.SystemBus()
+mainloop = gobject.MainLoop()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <command>" % (sys.argv[0])
+	print ""
+	print "	 list"
+	print "	 services <address>"
+	print "	 discover <service path>"
+	print "	 chars <service path>"
+	sys.exit(1)
+
+if (args[0] == "list"):
+	for path in adapter.ListDevices():
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		devprop = device.GetProperties()
+		print "[ %s ]" % devprop["Address"]
+		for path in devprop["Services"]:
+
+			service = dbus.Interface(bus.get_object("org.bluez", path),
+									 "org.bluez.Characteristic")
+			srvprop = service.GetProperties()
+			print " * %s" % (path)
+			print "	UUID: %s" % srvprop["UUID"]
+			print "	Chars: ",
+			for char in srvprop["Characteristics"]:
+				print "%s " % char,
+			print
+			print
+		print
+	sys.exit(0)
+
+if (args[0] == "services"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		properties = device.GetProperties()
+		for path in properties["Services"]:
+			print path
+	sys.exit(0)
+
+if (args[0] == "discover"):
+	if (len(args) < 2):
+		print "Need service path parameter"
+	else:
+		service = dbus.Interface(bus.get_object("org.bluez", args[1]),
+							"org.bluez.Characteristic")
+		for path in service.DiscoverCharacteristics():
+			print path
+	sys.exit(0)
+
+if (args[0] == "chars"):
+	if (len(args) < 2):
+		print "Need service path parameter"
+	else:
+		service = dbus.Interface(bus.get_object("org.bluez", args[1]),
+								 "org.bluez.Characteristic")
+		srvprop = service.GetProperties()
+		for path in srvprop["Characteristics"]:
+			print "[ %s ]" % (path)
+			char = dbus.Interface(bus.get_object("org.bluez", path),
+								 "org.bluez.Characteristic")
+			charprop = char.GetProperties()
+			print "	Name: %s" % charprop["Name"]
+			print "	UUID: %s" % charprop["UUID"]
+			print
+		print
+	sys.exit(0)
+
+print "Unknown command"
+sys.exit(1)

=== added file '.pc/python3.patch/test/test-audio'
--- .pc/python3.patch/test/test-audio	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-audio	2012-04-27 03:38:31 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if len(args) < 2:
+	print """Usage: %s <command>
+
+	connect <bdaddr>
+	disconnect <bdaddr>
+	""" % sys.argv[0]
+	sys.exit(1)
+
+device = adapter.FindDevice(args[1])
+audio = dbus.Interface(bus.get_object("org.bluez", device),
+				"org.bluez.Audio")
+
+if args[0] == "connect":
+	audio.Connect()
+elif args[0] == "disconnect":
+	audio.Disconnect()
+else:
+	print "Unknown command"
+	sys.exit(1)

=== added file '.pc/python3.patch/test/test-device'
--- .pc/python3.patch/test/test-device	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-device	2012-04-27 03:38:31 +0000
@@ -0,0 +1,207 @@
+#!/usr/bin/python
+
+import gobject
+
+import sys
+import dbus
+import dbus.mainloop.glib
+import re
+from optparse import OptionParser, make_option
+
+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+bus = dbus.SystemBus()
+mainloop = gobject.MainLoop()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <command>" % (sys.argv[0])
+	print ""
+	print "  list"
+	print "  services <address>"
+	print "  create <address>"
+	print "  remove <address|path>"
+	print "  disconnect <address>"
+	print "  discover <address> [pattern]"
+	print "  class <address>"
+	print "  name <address>"
+	print "  alias <address> [alias]"
+	print "  trusted <address> [yes/no]"
+	print "  blocked <address> [yes/no]"
+	sys.exit(1)
+
+if (args[0] == "list"):
+	for path in adapter.ListDevices():
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		properties = device.GetProperties()
+		print "%s %s" % (properties["Address"], properties["Alias"])
+
+	sys.exit(0)
+
+def create_device_reply(device):
+	print "New device (%s)" % device
+	mainloop.quit()
+	sys.exit(0)
+
+def create_device_error(error):
+	print "Creating device failed: %s" % error
+	mainloop.quit()
+	sys.exit(1)
+
+if (args[0] == "create"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		adapter.CreateDevice(args[1],
+				reply_handler=create_device_reply,
+				error_handler=create_device_error)
+	mainloop.run()
+
+if (args[0] == "remove"):
+	if (len(args) < 2):
+		print "Need address or object path parameter"
+	else:
+		try:
+			path = adapter.FindDevice(args[1])
+		except:
+			path = args[1]
+		adapter.RemoveDevice(path)
+	sys.exit(0)
+
+if (args[0] == "disconnect"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		device.Disconnect()
+	sys.exit(0)
+
+if (args[0] == "discover"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		if (len(args) < 3):
+			pattern = ""
+		else:
+			pattern = args[2]
+		services = device.DiscoverServices(pattern);
+		for key in services.keys():
+			p = re.compile(">.*?<")
+			xml = p.sub("><", services[key].replace("\n", ""))
+			print "[ 0x%5x ]" % (key)
+			print xml
+			print
+	sys.exit(0)
+
+if (args[0] == "class"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		properties = device.GetProperties()
+		print "0x%06x" % (properties["Class"])
+	sys.exit(0)
+
+if (args[0] == "name"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		properties = device.GetProperties()
+		print properties["Name"]
+	sys.exit(0)
+
+if (args[0] == "alias"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		if (len(args) < 3):
+			properties = device.GetProperties()
+			print properties["Alias"]
+		else:
+			device.SetProperty("Alias", args[2])
+	sys.exit(0)
+
+if (args[0] == "trusted"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		if (len(args) < 3):
+			properties = device.GetProperties()
+			print properties["Trusted"]
+		else:
+			if (args[2] == "yes"):
+				value = dbus.Boolean(1)
+			elif (args[2] == "no"):
+				value = dbus.Boolean(0)
+			else:
+				value = dbus.Boolean(args[2])
+			device.SetProperty("Trusted", value)
+	sys.exit(0)
+
+if (args[0] == "blocked"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		if (len(args) < 3):
+			properties = device.GetProperties()
+			print properties["Blocked"]
+		else:
+			if (args[2] == "yes"):
+				value = dbus.Boolean(1)
+			elif (args[2] == "no"):
+				value = dbus.Boolean(0)
+			else:
+				value = dbus.Boolean(args[2])
+			device.SetProperty("Blocked", value)
+	sys.exit(0)
+
+if (args[0] == "services"):
+	if (len(args) < 2):
+		print "Need address parameter"
+	else:
+		path = adapter.FindDevice(args[1])
+		device = dbus.Interface(bus.get_object("org.bluez", path),
+							"org.bluez.Device")
+		properties = device.GetProperties()
+		for path in properties["Services"]:
+			print path
+	sys.exit(0)
+
+print "Unknown command"
+sys.exit(1)

=== added file '.pc/python3.patch/test/test-discovery'
--- .pc/python3.patch/test/test-discovery	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-discovery	2012-04-27 03:38:31 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import gobject
+
+import dbus
+import dbus.mainloop.glib
+from optparse import OptionParser, make_option
+
+def device_found(address, properties):
+	print "[ " + address + " ]"
+
+	for key in properties.keys():
+		value = properties[key]
+		if (key == "Class"):
+			print "    %s = 0x%06x" % (key, value)
+		else:
+			print "    %s = %s" % (key, value)
+
+def property_changed(name, value):
+	if (name == "Discovering" and not value):
+		mainloop.quit()
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+							"org.bluez.Manager")
+
+	option_list = [
+			make_option("-i", "--device", action="store",
+					type="string", dest="dev_id"),
+			]
+	parser = OptionParser(option_list=option_list)
+
+	(options, args) = parser.parse_args()
+
+	if options.dev_id:
+		adapter_path = manager.FindAdapter(options.dev_id)
+	else:
+		adapter_path = manager.DefaultAdapter()
+
+	adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+	bus.add_signal_receiver(device_found,
+			dbus_interface = "org.bluez.Adapter",
+					signal_name = "DeviceFound")
+
+	bus.add_signal_receiver(property_changed,
+			dbus_interface = "org.bluez.Adapter",
+					signal_name = "PropertyChanged")
+
+	adapter.StartDiscovery()
+
+	mainloop = gobject.MainLoop()
+	mainloop.run()

=== added file '.pc/python3.patch/test/test-health'
--- .pc/python3.patch/test/test-health	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-health	2012-04-27 03:38:31 +0000
@@ -0,0 +1,217 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import dbus
+import dbus.service
+import gobject
+from dbus.mainloop.glib import DBusGMainLoop
+import sys
+
+DBusGMainLoop(set_as_default=True)
+loop = gobject.MainLoop()
+
+bus = dbus.SystemBus()
+
+def sig_received(*args, **kwargs):
+	if "member" not in kwargs:
+		return
+	if "path" not in kwargs:
+		return;
+	sig_name = kwargs["member"]
+	path = kwargs["path"]
+	print sig_name
+	print path
+	if sig_name == "PropertyChanged":
+		k, v = args
+		print k
+		print v
+	else:
+		ob = args[0]
+		print ob
+
+
+def enter_mainloop():
+	bus.add_signal_receiver(sig_received, bus_name="org.bluez",
+				dbus_interface = "org.bluez.HealthDevice",
+				path_keyword="path",
+				member_keyword="member",
+				interface_keyword="interface")
+
+	try:
+		print "Entering main lopp, push Ctrl+C for finish"
+
+		mainloop = gobject.MainLoop()
+		mainloop.run()
+	except KeyboardInterrupt:
+		pass
+	finally:
+		print "Exiting, bye"
+
+hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/org/bluez"),
+						"org.bluez.HealthManager")
+
+role = None
+while role == None:
+	print "Select 1. source or 2. sink: ",
+	try:
+		sel = int(sys.stdin.readline())
+		if sel == 1:
+			role = "Source"
+		elif sel == 2:
+			role = "Sink"
+		else:
+			raise ValueError
+	except (TypeError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+dtype = None
+while dtype == None:
+	print "Select a data type: ",
+	try:
+		sel = int(sys.stdin.readline())
+		if (sel < 0) or (sel > 65535):
+			raise ValueError
+		dtype = sel;
+	except (TypeError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+pref = None
+if role == "Source":
+	while pref == None:
+		try:
+			print "Select a preferred data channel type 1.",
+			print "reliable 2. streaming: ",
+			sel = int(sys.stdin.readline())
+			if sel == 1:
+				pref = "Reliable"
+			elif sel == 2:
+				pref = "Streaming"
+			else:
+				raise ValueError
+
+		except (TypeError, ValueError):
+			print "Wrong selection, try again"
+		except KeyboardInterrupt:
+			sys.exit()
+
+	app_path = hdp_manager.CreateApplication({
+					"DataType": dbus.types.UInt16(dtype),
+					"Role": role,
+					"Description": "Test Source",
+					"ChannelType": pref})
+else:
+	app_path = hdp_manager.CreateApplication({
+					"DataType": dbus.types.UInt16(dtype),
+					"Description": "Test sink",
+					"Role": role})
+
+print "New application created:", app_path
+
+con = None
+while con == None:
+	try:
+		print "Connect to a remote device (y/n)? ",
+		sel = sys.stdin.readline()
+		if sel in ("y\n", "yes\n", "Y\n", "YES\n"):
+			con = True
+		elif sel in ("n\n", "no\n", "N\n", "NO\n"):
+			con = False
+		else:
+			print "Wrong selection, try again."
+	except KeyboardInterrupt:
+		sys.exit()
+
+if not con:
+	enter_mainloop()
+	sys.exit()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+adapters = manager.ListAdapters()
+
+i = 1
+for ad in adapters:
+	print "%d. %s" % (i, ad)
+	i = i + 1
+
+print "Select an adapter: ",
+select = None
+while select == None:
+	try:
+		pos = int(sys.stdin.readline()) - 1
+		if pos < 0:
+			raise TypeError
+		select = adapters[pos]
+	except (TypeError, IndexError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+adapter =  dbus.Interface(bus.get_object("org.bluez", select),
+						"org.bluez.Adapter")
+
+devices = adapter.ListDevices()
+
+if len(devices) == 0:
+	print "No devices available"
+	sys.exit()
+
+i = 1
+for dev in devices:
+	print "%d. %s" % (i, dev)
+	i = i + 1
+
+print "Select a device: ",
+select = None
+while select == None:
+	try:
+		pos = int(sys.stdin.readline()) - 1
+		if pos < 0:
+			raise TypeError
+		select = devices[pos]
+	except (TypeError, IndexError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+device = dbus.Interface(bus.get_object("org.bluez", select),
+					"org.bluez.HealthDevice")
+
+echo = None
+while echo == None:
+	try:
+		print "Perform an echo (y/n)? ",
+		sel = sys.stdin.readline()
+		if sel in ("y\n", "yes\n", "Y\n", "YES\n"):
+			echo = True
+		elif sel in ("n\n", "no\n", "N\n", "NO\n"):
+			echo = False
+		else:
+			print "Wrong selection, try again."
+	except KeyboardInterrupt:
+		sys.exit()
+
+if echo:
+	if device.Echo():
+		print "Echo was ok"
+	else:
+		print "Echo war wrong, exiting"
+		sys.exit()
+
+print "Connecting to device %s" % (select)
+
+if role == "Source":
+	chan = device.CreateChannel(app_path, "Reliable")
+else:
+	chan = device.CreateChannel(app_path, "Any")
+
+print chan
+
+enter_mainloop()
+
+hdp_manager.DestroyApplication(app_path)

=== added file '.pc/python3.patch/test/test-health-sink'
--- .pc/python3.patch/test/test-health-sink	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-health-sink	2012-04-27 03:38:31 +0000
@@ -0,0 +1,83 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import dbus
+import dbus.service
+import gobject
+from dbus.mainloop.glib import DBusGMainLoop
+import sys
+
+DBusGMainLoop(set_as_default=True)
+loop = gobject.MainLoop()
+
+bus = dbus.SystemBus()
+
+hdp_manager = dbus.Interface(bus.get_object("org.bluez", "/org/bluez"),
+						"org.bluez.HealthManager")
+app_path = hdp_manager.CreateApplication({"DataType": dbus.types.UInt16(4103),
+					"Role": "sink"})
+
+print app_path
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+adapters = manager.ListAdapters()
+
+i = 1
+for ad in adapters:
+	print "%d. %s" % (i, ad)
+	i = i + 1
+
+print "Select an adapter: ",
+select = None
+while select == None:
+	try:
+		pos = int(sys.stdin.readline()) - 1
+		if pos < 0:
+			raise TypeError
+		select = adapters[pos]
+	except (TypeError, IndexError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+adapter =  dbus.Interface(bus.get_object("org.bluez", select),
+						"org.bluez.Adapter")
+
+devices = adapter.ListDevices()
+
+if len(devices) == 0:
+	print "No devices available"
+	sys.exit()
+
+i = 1
+for dev in devices:
+	print "%d. %s" % (i, dev)
+	i = i + 1
+
+print "Select a device: ",
+select = None
+while select == None:
+	try:
+		pos = int(sys.stdin.readline()) - 1
+		if pos < 0:
+			raise TypeError
+		select = devices[pos]
+	except (TypeError, IndexError, ValueError):
+		print "Wrong selection, try again: ",
+	except KeyboardInterrupt:
+		sys.exit()
+
+print "Connecting to %s" % (select)
+device = dbus.Interface(bus.get_object("org.bluez", select),
+					"org.bluez.HealthDevice")
+
+chan = device.CreateChannel(app_path, "Any")
+
+print chan
+
+print "Push Enter for finishing"
+sys.stdin.readline()
+
+hdp_manager.DestroyApplication(app_path)

=== added file '.pc/python3.patch/test/test-input'
--- .pc/python3.patch/test/test-input	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-input	2012-04-27 03:38:31 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if len(args) < 2:
+	print """Usage: %s <command>
+
+	connect <bdaddr>
+	disconnect <bdaddr>
+	""" % sys.argv[0]
+	sys.exit(1)
+
+device = adapter.FindDevice(args[1])
+input = dbus.Interface(bus.get_object("org.bluez", device),
+				"org.bluez.Input")
+
+if args[0] == "connect":
+	input.Connect()
+elif args[0] == "disconnect":
+	input.Disconnect()
+else:
+	print "Unknown command"
+	sys.exit(1)

=== added file '.pc/python3.patch/test/test-manager'
--- .pc/python3.patch/test/test-manager	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-manager	2012-04-27 03:38:31 +0000
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+
+import gobject
+
+import dbus
+import dbus.mainloop.glib
+
+def adapter_added(path):
+	print "Adapter with path %s added" % (path)
+
+def adapter_removed(path):
+	print "Adapter with path %s removed" % (path)
+
+def default_changed(path):
+	print "Default adapter is now at path %s" % (path)
+
+if __name__ == "__main__":
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	manager = dbus.Interface(bus.get_object('org.bluez', '/'),
+							'org.bluez.Manager')
+
+	manager.connect_to_signal("AdapterAdded", adapter_added)
+
+	manager.connect_to_signal("AdapterRemoved", adapter_removed)
+
+	manager.connect_to_signal("DefaultAdapterChanged", default_changed)
+
+	try:
+		path = manager.DefaultAdapter()
+		default_changed(path)
+	except:
+		pass
+
+	mainloop = gobject.MainLoop()
+	mainloop.run()

=== added file '.pc/python3.patch/test/test-network'
--- .pc/python3.patch/test/test-network	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-network	2012-04-27 03:38:31 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import sys
+import time
+import dbus
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <address> [service]" % (sys.argv[0])
+	sys.exit(1)
+
+address = args[0]
+
+if (len(args) < 2):
+	service = "panu"
+else:
+	service = args[1]
+
+device = adapter.FindDevice(address)
+
+network = dbus.Interface(bus.get_object("org.bluez", device),
+						"org.bluez.Network")
+
+iface = network.Connect(service)
+
+print "Connected %s to %s" % (device, address)
+
+print "Press CTRL-C to disconnect"
+
+try:
+	time.sleep(1000)
+	print "Terminating connection"
+except:
+	pass
+
+network.Disconnect()

=== added file '.pc/python3.patch/test/test-oob'
--- .pc/python3.patch/test/test-oob	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-oob	2012-04-27 03:38:31 +0000
@@ -0,0 +1,80 @@
+#!/usr/bin/python
+
+import gobject
+
+import dbus.mainloop.glib
+
+def create_device_reply(device):
+	print "Pairing succeed!"
+	mainloop.quit()
+
+def create_device_error(error):
+	print "Pairing failed."
+	mainloop.quit()
+
+if __name__ == '__main__':
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	mainloop = gobject.MainLoop()
+
+	bus = dbus.SystemBus()
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+							"org.bluez.Manager")
+
+	adapter0_path = manager.FindAdapter("hci0")
+	adapter1_path = manager.FindAdapter("hci1")
+
+	adapter0 = dbus.Interface(bus.get_object("org.bluez", adapter0_path),
+							"org.bluez.Adapter")
+	adapter1 = dbus.Interface(bus.get_object("org.bluez", adapter1_path),
+							"org.bluez.Adapter")
+
+	adapter0_address = adapter0.GetProperties()["Address"]
+	adapter1_address = adapter1.GetProperties()["Address"]
+	print "Adapters:"
+	print "    hci0: " + adapter0_address
+	print "    hci1: " + adapter1_address
+	print
+
+	print "Removing any existing bond..."
+
+	try:
+		device = adapter0.FindDevice(adapter1_address)
+		adapter0.RemoveDevice(device)
+	except:
+		pass
+
+	try:
+		device = adapter1.FindDevice(adapter0_address)
+		adapter1.RemoveDevice(device)
+	except:
+		pass
+
+	print "Done."
+	print
+	print "Reading local Out of Band data..."
+
+	oob_adapter0 = dbus.Interface(bus.get_object("org.bluez",
+					adapter0_path), "org.bluez.OutOfBand")
+	oob_adapter1 = dbus.Interface(bus.get_object("org.bluez",
+					adapter1_path), "org.bluez.OutOfBand")
+
+	oob0 = oob_adapter0.ReadLocalData()
+	oob1 = oob_adapter1.ReadLocalData()
+
+	print "Done."
+	print
+	print "Exchanging Out of Band data..."
+
+	oob_adapter0.AddRemoteData(adapter1_address, oob1[0], oob1[1])
+	oob_adapter1.AddRemoteData(adapter0_address, oob0[0], oob0[1])
+
+	print "Done."
+	print
+	print "Starting to pair."
+	adapter1.CreatePairedDevice(adapter0_address, "/test/agent_oob",
+					"DisplayYesNo",
+					reply_handler=create_device_reply,
+					error_handler=create_device_error)
+
+	mainloop.run()

=== added file '.pc/python3.patch/test/test-proximity'
--- .pc/python3.patch/test/test-proximity	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-proximity	2012-04-27 03:38:31 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/python
+
+'''
+Proximity Monitor test script
+'''
+
+import gobject
+
+import sys
+import dbus
+import dbus.mainloop.glib
+from optparse import OptionParser, make_option
+
+def property_changed(name, value):
+
+	print "PropertyChanged('%s', '%s')" % (name, value)
+	mainloop.quit()
+
+if __name__ == "__main__":
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+					"org.bluez.Manager")
+
+	option_list = [
+		make_option("-i", "--adapter", action="store",
+			type="string", dest="dev_id"),
+		make_option("-b", "--device", action="store",
+			type="string", dest="address"),
+
+		]
+	parser = OptionParser(option_list=option_list)
+
+	(options, args) = parser.parse_args()
+
+	if options.dev_id:
+		adapter_path = manager.FindAdapter(options.dev_id)
+	else:
+		adapter_path = manager.DefaultAdapter()
+
+	adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+	if (len(args) < 1):
+		print "Usage: %s <command>" % (sys.argv[0])
+		print ""
+		print "  -b MAC LinkLossAlertLevel <none|mild|high>"
+		print "  -b MAC ImmediateAlertLevel <none|mild|high>"
+		sys.exit(1)
+
+	device_path = adapter.FindDevice(options.address)
+
+	bus.add_signal_receiver(property_changed, bus_name="org.bluez",
+				dbus_interface="org.bluez.Proximity",
+				signal_name="PropertyChanged")
+
+	proximity = dbus.Interface(bus.get_object("org.bluez",
+					device_path), "org.bluez.Proximity")
+
+	print "Proximity SetProperty('%s', '%s')" % (args[0], args[1])
+	proximity.SetProperty(args[0], args[1])
+
+	mainloop = gobject.MainLoop()
+	mainloop.run()

=== added file '.pc/python3.patch/test/test-sap-server'
--- .pc/python3.patch/test/test-sap-server	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-sap-server	2012-04-27 03:38:31 +0000
@@ -0,0 +1,138 @@
+#!/usr/bin/python
+
+from sap import *
+import time
+
+def connect_disconnect_by_client(sap):
+
+    print "[Test] Connect - Disconnect by client \n"
+
+    try:
+        if not sap.isConnected():
+           sap.connect()
+
+        if sap.proc_connect():
+            if sap.proc_disconnectByClient():
+                print "OK"
+                return 0
+
+        print "NOT OK"
+        return 1
+
+    except BluetoothError , e:
+        print "Error " + str(e)
+
+
+def connect_disconnect_by_server_gracefully(sap, timeout=0):
+
+    print "[Test] Connect - Disconnect by server with timer \n"
+
+    try:
+        if not sap.isConnected():
+           sap.connect()
+
+        if sap.proc_connect():
+            if sap.proc_disconnectByServer(timeout):
+                print "OK"
+                return 0
+
+        print "NOT OK"
+        return 1
+
+    except BluetoothError , e:
+        print "Error " + str(e)
+
+
+def connect_txAPDU_disconnect_by_client(sap):
+
+    print "[Test] Connect - TX APDU - Disconnect by client \n"
+
+    try:
+        if not sap.isConnected():
+           sap.connect()
+
+        if sap.proc_connect():
+            if not sap.proc_transferAPDU():
+                print "NOT OK 1"
+                return 1
+
+            if not sap.proc_transferAPDU():
+                print "NOT OK 2"
+                return 1
+
+            if not sap.proc_transferAPDU():
+                print "NOT OK 3"
+                return 1
+
+            if not sap.proc_transferAPDU():
+                print "NOT OK 4"
+                return 1
+
+            if sap.proc_disconnectByClient():
+                print "OK"
+                return 0
+
+        print "NOT OK"
+        return 1
+
+    except BluetoothError , e:
+        print "Error " + str(e)
+
+def connect_rfcomm_only_and_wait_for_close_by_server(sap):
+
+    print "[Test] Connect rfcomm only  - Disconnect by server timeout \n"
+
+    if not sap.isConnected():
+       sap.connect()
+
+    time.sleep(40)
+    print "OK"
+
+def power_sim_off_on(sap):
+
+    print "[Test] Powe sim off \n"
+
+    try:
+        if not sap.isConnected():
+           sap.connect()
+
+        if sap.proc_connect():
+            if not sap.proc_resetSim():
+                print "NOT OK"
+                return 1
+
+            if not sap.proc_powerSimOff():
+                print "NOT OK"
+                return 1
+
+            if not sap.proc_powerSimOn():
+                print "NOT OK"
+                return 1
+
+            if sap.proc_disconnectByClient():
+                print "OK"
+                return 0
+
+        print "NOT OK"
+        return 1
+
+    except BluetoothError , e:
+        print "Error " + str(e)
+
+
+if __name__ == "__main__":
+
+    host = "00:00:00:00:00:0"  # server bd_addr
+    port = 8  # sap server port
+
+    try:
+        s = SAPClient(host, port)
+    except BluetoothError , e:
+        print "Error " + str(e)
+
+    connect_disconnect_by_client(s)
+    connect_disconnect_by_server_gracefully(s)
+    connect_disconnect_by_server_gracefully(s, 40)  #  wait 40 sec for srv to close rfcomm sock
+    connect_rfcomm_only_and_wait_for_close_by_server(s)
+    connect_txAPDU_disconnect_by_client(s)
+    power_sim_off_on(s)

=== added file '.pc/python3.patch/test/test-serial'
--- .pc/python3.patch/test/test-serial	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-serial	2012-04-27 03:38:31 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+import sys
+import time
+import dbus
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <address> [service]" % (sys.argv[0])
+	sys.exit(1)
+
+address = args[0]
+
+if (len(args) < 2):
+	service = "spp"
+else:
+	service = args[1]
+
+path = adapter.FindDevice(address)
+
+serial = dbus.Interface(bus.get_object("org.bluez", path),
+						"org.bluez.Serial")
+
+node = serial.Connect(service)
+
+print "Connected %s to %s" % (node, address)
+
+print "Press CTRL-C to disconnect"
+
+try:
+	time.sleep(1000)
+	print "Terminating connection"
+except:
+	pass
+
+serial.Disconnect(node)

=== added file '.pc/python3.patch/test/test-serial-proxy'
--- .pc/python3.patch/test/test-serial-proxy	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-serial-proxy	2012-04-27 03:38:31 +0000
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+
+import sys
+import time
+import dbus
+import socket
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+						"org.bluez.Manager")
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+if (len(args) < 1):
+	print "Usage: %s <socket_name> [service]" % (sys.argv[0])
+	sys.exit(1)
+
+socket_name = args[0]
+
+if (len(args) < 2):
+	service = "spp"
+else:
+	service = args[1]
+
+sk = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+sk.bind(socket_name)
+sk.listen(1)
+
+proxy_manager = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+						"org.bluez.SerialProxyManager")
+proxy_path = proxy_manager.CreateProxy(service, socket_name)
+
+proxy = dbus.Interface(bus.get_object("org.bluez", proxy_path),
+							"org.bluez.SerialProxy")
+proxy.Enable()
+
+conn, addr = sk.accept()
+
+print "Waiting for message"
+
+while 1:
+	data = conn.recv(1024)
+	if data:
+		print(data)
+		break
+
+proxy.Disable()
+proxy_manager.RemoveProxy(proxy_path)
+conn.close()

=== added file '.pc/python3.patch/test/test-service'
--- .pc/python3.patch/test/test-service	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-service	2012-04-27 03:38:31 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+import time
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+service = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+						"org.bluez.Service")
+
+if (len(args) < 1):
+	print "Usage: %s <command>" % (sys.argv[0])
+	print ""
+	print "  addrecord <file>"
+	sys.exit(1)
+
+if (args[0] == "addrecord"):
+	if (len(args) < 2):
+		print "Need file parameter"
+	else:
+		f = open(args[1])
+		record = f.read()
+		f.close()
+		handle = service.AddRecord(record)
+		print "0x%x" % (handle)
+		time.sleep(120)
+	sys.exit(0)
+
+print "Unknown command"
+sys.exit(1)

=== added file '.pc/python3.patch/test/test-telephony'
--- .pc/python3.patch/test/test-telephony	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-telephony	2012-04-27 03:38:31 +0000
@@ -0,0 +1,176 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+from optparse import OptionParser, make_option
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+
+option_list = [
+		make_option("-i", "--device", action="store",
+				type="string", dest="dev_id"),
+		]
+parser = OptionParser(option_list=option_list)
+
+(options, args) = parser.parse_args()
+
+if options.dev_id:
+	adapter_path = manager.FindAdapter(options.dev_id)
+else:
+	adapter_path = manager.DefaultAdapter()
+
+adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+test = dbus.Interface(bus.get_object("org.bluez", "/org/bluez/test"),
+			"org.bluez.TelephonyTest")
+
+if len(args) < 1:
+	print """Usage: %s <command>
+
+	connect <bdaddr>
+	disconnect <bdaddr>
+	outgoing <number>
+	incoming <number>
+	cancel
+	signal <level>
+	battery <level>
+	roaming <yes|no>
+	registration <status>
+	subscriber <number>
+	speakergain <bdaddr> [level]
+	microphonegain <bdaddr> [level]
+	play <bdaddr>
+	stop <bdaddr>
+	""" % sys.argv[0]
+	sys.exit(1)
+
+if args[0] == "connect":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	headset.Connect()
+	sys.exit(0)
+
+if args[0] == "disconnect":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	headset.Disconnect()
+	sys.exit(0)
+
+if args[0] == "speakergain":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	if len(args) > 2:
+		headset.SetProperty('SpeakerGain', dbus.UInt16(args[2]))
+	else:
+		props = headset.GetProperties()
+		print props['SpeakerGain']
+
+	sys.exit(0)
+
+if args[0] == "microphonegain":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	if len(args) > 2:
+		headset.SetProperty('MicrophoneGain', dbus.UInt16(args[2]))
+	else:
+		props = headset.GetProperties()
+		print props['MicrophoneGain']
+
+	sys.exit(0)
+
+if args[0] == "play":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	headset.Play()
+
+	sys.exit(0)
+
+if args[0] == "stop":
+	if len(args) < 2:
+		print "Need device address parameter"
+		sys.exit(1)
+	device = adapter.FindDevice(args[1])
+	headset = dbus.Interface(bus.get_object("org.bluez", device),
+					"org.bluez.Headset")
+	headset.Stop()
+
+	sys.exit(0)
+
+if args[0] == "outgoing":
+	if len(args) > 1:
+		test.OutgoingCall(args[1])
+	else:
+		print "Need number parameter"
+	sys.exit(0)
+
+if args[0] == "incoming":
+	if len(args) > 1:
+		test.IncomingCall(args[1])
+	else:
+		print "Need number parameter"
+	sys.exit(0)
+
+if args[0] == "cancel":
+	test.CancelCall()
+	sys.exit(0)
+
+if args[0] == "signal":
+	if len(args) > 1:
+		test.SignalStrength(args[1])
+	else:
+		print "Need signal strength parameter"
+	sys.exit(0)
+
+if args[0] == "battery":
+	if len(args) > 1:
+		test.BatteryLevel(args[1])
+	else:
+		print "Need battery level parameter"
+	sys.exit(0)
+
+if args[0] == "roaming":
+	if len(args) > 1:
+		test.RoamingStatus(args[1] == "yes" or False)
+	else:
+		print "Need yes/no parameter"
+	sys.exit(0)
+
+if args[0] == "registration":
+	if len(args) > 1:
+		test.RegistrationStatus(args[1] == "yes" or False)
+	else:
+		print "Need yes/no parameter"
+	sys.exit(0)
+
+if args[0] == "subscriber":
+	if len(args) > 1:
+		test.SetSubscriberNumber(args[1])
+	else:
+		print "Need number parameter"
+	sys.exit(0)
+
+print "Unknown command"
+sys.exit(1)

=== added file '.pc/python3.patch/test/test-thermometer'
--- .pc/python3.patch/test/test-thermometer	1970-01-01 00:00:00 +0000
+++ .pc/python3.patch/test/test-thermometer	2012-04-27 03:38:31 +0000
@@ -0,0 +1,88 @@
+#!/usr/bin/python
+
+'''
+Thermometer test script
+'''
+
+import gobject
+
+import sys
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+from optparse import OptionParser, make_option
+
+class Watcher(dbus.service.Object):
+	@dbus.service.method("org.bluez.ThermometerWatcher",
+					in_signature="a{sv}", out_signature="")
+	def MeasurementReceived(self, measure):
+		print measure["Measurement"], " measurement received"
+		print "Exponent: ", measure["Exponent"]
+		print "Mantissa: ", measure["Mantissa"]
+		print "Unit: ", measure["Unit"]
+
+		if measure.has_key("Time"):
+			print "Time: ", measure["Time"]
+
+		print "Type: ", measure["Type"]
+
+def property_changed(name, value):
+
+	print "PropertyChanged('%s', '%s')" % (name, value)
+
+if __name__ == "__main__":
+	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+	bus = dbus.SystemBus()
+
+	manager = dbus.Interface(bus.get_object("org.bluez", "/"),
+					"org.bluez.Manager")
+
+	option_list = [
+		make_option("-i", "--adapter", action="store",
+			type="string", dest="adapter"),
+		make_option("-b", "--device", action="store",
+			type="string", dest="address"),
+		]
+
+	parser = OptionParser(option_list=option_list)
+
+	(options, args) = parser.parse_args()
+
+	if not options.address:
+		print "Usage: %s [-i <adapter>] -b <bdaddr> [command]" % (sys.argv[0])
+		print "Possible commands:"
+		print "\tEnableIntermediateMeasurement"
+		sys.exit(1)
+
+	if options.adapter:
+		adapter_path = manager.FindAdapter(options.adapter)
+	else:
+		adapter_path = manager.DefaultAdapter()
+
+	adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+							"org.bluez.Adapter")
+
+	device_path = adapter.FindDevice(options.address)
+
+	bus.add_signal_receiver(property_changed, bus_name="org.bluez",
+				dbus_interface="org.bluez.Thermometer",
+				signal_name="PropertyChanged")
+
+	thermometer = dbus.Interface(bus.get_object("org.bluez",
+					device_path), "org.bluez.Thermometer")
+
+	path = "/test/watcher"
+	watcher = Watcher(bus, path)
+
+	thermometer.RegisterWatcher(path)
+
+	if len(args) > 0:
+		if args[0] == "EnableIntermediateMeasurement":
+			thermometer.EnableIntermediateMeasurement(path)
+		else:
+			print "unknown command"
+			sys.exit(1)
+
+	mainloop = gobject.MainLoop()
+	mainloop.run()

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-21 15:27:57 +0000
+++ debian/changelog	2012-04-27 03:38:31 +0000
@@ -1,3 +1,9 @@
+bluez (4.98-2ubuntu8) UNRELEASED; urgency=low
+
+  * Switch to python3.
+
+ -- Steve Langasek <[e-mail]>  Wed, 25 Apr 2012 23:07:20 -0700
+
 bluez (4.98-2ubuntu7) precise; urgency=low
 
   * debian/patches/10-unregister_interface_on_exit.patch: unregister the SAP

=== modified file 'debian/control'
--- debian/control	2012-03-13 19:41:36 +0000
+++ debian/control	2012-04-27 03:38:31 +0000
@@ -20,7 +20,8 @@
                libcap-ng-dev,
                libudev-dev,
                libreadline-dev,
-               check (>= 0.9.8-1.1)
+               check (>= 0.9.8-1.1),
+               python3-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk
 Homepage: http://www.bluez.org
@@ -73,7 +74,7 @@
 Package: bluez
 Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 s390x sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, module-init-tools, udev (>= 170-1), lsb-base, dbus, python-dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, module-init-tools, udev (>= 170-1), lsb-base, dbus, python3-dbus
 Replaces: bluez-input, bluez-network, bluez-serial, bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3), udev (<< 170-1)
 Conflicts: bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3)
 Breaks: udev (<< 170-1)

=== added file 'debian/patches/python3.patch'
--- debian/patches/python3.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/python3.patch	2012-04-27 03:38:31 +0000
@@ -0,0 +1,984 @@
+Index: trunk/test/list-devices
+===================================================================
+--- trunk.orig/test/list-devices
++++ trunk/test/list-devices
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import dbus
+ 
+Index: trunk/test/monitor-bluetooth
+===================================================================
+--- trunk.orig/test/monitor-bluetooth
++++ trunk/test/monitor-bluetooth
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import gobject
+ 
+Index: trunk/test/simple-agent
+===================================================================
+--- trunk.orig/test/simple-agent
++++ trunk/test/simple-agent
+@@ -1,6 +1,6 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+-import gobject
++from gi.repository import GObject
+ 
+ import sys
+ import dbus
+@@ -20,14 +20,14 @@
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="", out_signature="")
+ 	def Release(self):
+-		print "Release"
++		print("Release")
+ 		if self.exit_on_release:
+ 			mainloop.quit()
+ 
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="os", out_signature="")
+ 	def Authorize(self, device, uuid):
+-		print "Authorize (%s, %s)" % (device, uuid)
++		print("Authorize (%s, %s)" % (device, uuid))
+ 		authorize = raw_input("Authorize connection (yes/no): ")
+ 		if (authorize == "yes"):
+ 			return
+@@ -36,25 +36,25 @@
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="o", out_signature="s")
+ 	def RequestPinCode(self, device):
+-		print "RequestPinCode (%s)" % (device)
++		print("RequestPinCode (%s)" % (device))
+ 		return raw_input("Enter PIN Code: ")
+ 
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="o", out_signature="u")
+ 	def RequestPasskey(self, device):
+-		print "RequestPasskey (%s)" % (device)
++		print("RequestPasskey (%s)" % (device))
+ 		passkey = raw_input("Enter passkey: ")
+ 		return dbus.UInt32(passkey)
+ 
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="ou", out_signature="")
+ 	def DisplayPasskey(self, device, passkey):
+-		print "DisplayPasskey (%s, %d)" % (device, passkey)
++		print("DisplayPasskey (%s, %d)" % (device, passkey))
+ 
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="ou", out_signature="")
+ 	def RequestConfirmation(self, device, passkey):
+-		print "RequestConfirmation (%s, %d)" % (device, passkey)
++		print("RequestConfirmation (%s, %d)" % (device, passkey))
+ 		confirm = raw_input("Confirm passkey (yes/no): ")
+ 		if (confirm == "yes"):
+ 			return
+@@ -63,7 +63,7 @@
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="s", out_signature="")
+ 	def ConfirmModeChange(self, mode):
+-		print "ConfirmModeChange (%s)" % (mode)
++		print("ConfirmModeChange (%s)" % (mode))
+ 		authorize = raw_input("Authorize mode change (yes/no): ")
+ 		if (authorize == "yes"):
+ 			return
+@@ -72,14 +72,14 @@
+ 	@dbus.service.method("org.bluez.Agent",
+ 					in_signature="", out_signature="")
+ 	def Cancel(self):
+-		print "Cancel"
++		print("Cancel")
+ 
+ def create_device_reply(device):
+-	print "New device (%s)" % (device)
++	print("New device (%s)" % (device))
+ 	mainloop.quit()
+ 
+ def create_device_error(error):
+-	print "Creating device failed: %s" % (error)
++	print("Creating device failed: %s" % (error))
+ 	mainloop.quit()
+ 
+ if __name__ == '__main__':
+@@ -109,7 +109,7 @@
+ 	path = "/test/agent"
+ 	agent = Agent(bus, path)
+ 
+-	mainloop = gobject.MainLoop()
++	mainloop = GObject.MainLoop()
+ 
+ 	if len(args) > 1:
+ 		if len(args) > 2:
+@@ -122,9 +122,10 @@
+ 					error_handler=create_device_error)
+ 	else:
+ 		adapter.RegisterAgent(path, capability)
+-		print "Agent registered"
++		print("Agent registered")
+ 
+ 	mainloop.run()
+ 
+ 	#adapter.UnregisterAgent(path)
+-	#print "Agent unregistered"
++	#print("Agent unregistered")
++
+Index: trunk/test/simple-endpoint
+===================================================================
+--- trunk.orig/test/simple-endpoint
++++ trunk/test/simple-endpoint
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+Index: trunk/test/simple-service
+===================================================================
+--- trunk.orig/test/simple-service
++++ trunk/test/simple-service
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import time
+@@ -114,13 +114,13 @@
+ 
+ handle = service.AddRecord(xml)
+ 
+-print "Service record with handle 0x%04x added" % (handle)
++print("Service record with handle 0x%04x added" % (handle))
+ 
+-print "Press CTRL-C to remove service record"
++print("Press CTRL-C to remove service record")
+ 
+ try:
+ 	time.sleep(1000)
+-	print "Terminating session"
++	print("Terminating session")
+ except:
+ 	pass
+ 
+Index: trunk/test/test-adapter
+===================================================================
+--- trunk.orig/test/test-adapter
++++ trunk/test/test-adapter
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+@@ -26,28 +26,28 @@
+ 							"org.bluez.Adapter")
+ 
+ if (len(args) < 1):
+-	print "Usage: %s <command>" % (sys.argv[0])
+-	print ""
+-	print "  address"
+-	print "  list"
+-	print "  name [name]"
+-	print "  powered [on/off]"
+-	print "  pairable [on/off]"
+-	print "  pairabletimeout [timeout]"
+-	print "  discoverable [on/off]"
+-	print "  discoverabletimeout [timeout]"
+-	print "  discovering"
++	print("Usage: %s <command>" % (sys.argv[0]))
++	print("")
++	print("  address")
++	print("  list")
++	print("  name [name]")
++	print("  powered [on/off]")
++	print("  pairable [on/off]")
++	print("  pairabletimeout [timeout]")
++	print("  discoverable [on/off]")
++	print("  discoverabletimeout [timeout]")
++	print("  discovering")
+ 	sys.exit(1)
+ 
+ if (args[0] == "address"):
+ 	properties = adapter.GetProperties()
+-	print properties["Address"]
++	print(properties["Address"])
+ 	sys.exit(0)
+ 
+ if (args[0] == "name"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["Name"]
++		print(properties["Name"])
+ 	else:
+ 		adapter.SetProperty("Name", args[1])
+ 	sys.exit(0)
+@@ -59,19 +59,19 @@
+ 			adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+ 								"org.bluez.Adapter")
+ 			prop = adapter.GetProperties()
+-			print " [ %s ]" % (adapter_path)
+-			for (key, value) in prop.iteritems():
++			print(" [ %s ]" % (adapter_path))
++			for (key, value) in prop.items():
+ 				if (key == "Class"):
+-					print "    %s = 0x%06x" % (key, value)
++					print("    %s = 0x%06x" % (key, value))
+ 				else:
+-					print "    %s = %s" % (key, value)
+-			print
++					print("    %s = %s" % (key, value))
++			print()
+ 	sys.exit(0)
+ 
+ if (args[0] == "powered"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["Powered"]
++		print(properties["Powered"])
+ 	else:
+ 		if (args[1] == "on"):
+ 			value = dbus.Boolean(1)
+@@ -85,7 +85,7 @@
+ if (args[0] == "pairable"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["Pairable"]
++		print(properties["Pairable"])
+ 	else:
+ 		if (args[1] == "on"):
+ 			value = dbus.Boolean(1)
+@@ -99,7 +99,7 @@
+ if (args[0] == "pairabletimeout"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["PairableTimeout"]
++		print(properties["PairableTimeout"])
+ 	else:
+ 		timeout = dbus.UInt32(args[1])
+ 		adapter.SetProperty("PairableTimeout", timeout)
+@@ -108,7 +108,7 @@
+ if (args[0] == "discoverable"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["Discoverable"]
++		print(properties["Discoverable"])
+ 	else:
+ 		if (args[1] == "on"):
+ 			value = dbus.Boolean(1)
+@@ -122,7 +122,7 @@
+ if (args[0] == "discoverabletimeout"):
+ 	if (len(args) < 2):
+ 		properties = adapter.GetProperties()
+-		print properties["DiscoverableTimeout"]
++		print(properties["DiscoverableTimeout"])
+ 	else:
+ 		timeout = dbus.UInt32(args[1])
+ 		adapter.SetProperty("DiscoverableTimeout", timeout)
+@@ -130,8 +130,8 @@
+ 
+ if (args[0] == "discovering"):
+ 	properties = adapter.GetProperties()
+-	print properties["Discovering"]
++	print(properties["Discovering"])
+ 	sys.exit(0)
+ 
+-print "Unknown command"
++print("Unknown command")
+ sys.exit(1)
+Index: trunk/test/test-attrib
+===================================================================
+--- trunk.orig/test/test-attrib
++++ trunk/test/test-attrib
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Script for testing the Attribute D-Bus API
+ 
+ import sys
+Index: trunk/test/test-audio
+===================================================================
+--- trunk.orig/test/test-audio
++++ trunk/test/test-audio
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+@@ -25,11 +25,11 @@
+ 							"org.bluez.Adapter")
+ 
+ if len(args) < 2:
+-	print """Usage: %s <command>
++	print("""Usage: %s <command>
+ 
+ 	connect <bdaddr>
+ 	disconnect <bdaddr>
+-	""" % sys.argv[0]
++	""" % sys.argv[0])
+ 	sys.exit(1)
+ 
+ device = adapter.FindDevice(args[1])
+@@ -41,5 +41,5 @@
+ elif args[0] == "disconnect":
+ 	audio.Disconnect()
+ else:
+-	print "Unknown command"
++	print("Unknown command")
+ 	sys.exit(1)
+Index: trunk/test/test-device
+===================================================================
+--- trunk.orig/test/test-device
++++ trunk/test/test-device
+@@ -1,6 +1,6 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+-import gobject
++from gi.repository import GObject
+ 
+ import sys
+ import dbus
+@@ -10,7 +10,7 @@
+ 
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+ bus = dbus.SystemBus()
+-mainloop = gobject.MainLoop()
++mainloop = GObject.MainLoop()
+ 
+ manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+ 
+@@ -31,19 +31,19 @@
+ 							"org.bluez.Adapter")
+ 
+ if (len(args) < 1):
+-	print "Usage: %s <command>" % (sys.argv[0])
+-	print ""
+-	print "  list"
+-	print "  services <address>"
+-	print "  create <address>"
+-	print "  remove <address|path>"
+-	print "  disconnect <address>"
+-	print "  discover <address> [pattern]"
+-	print "  class <address>"
+-	print "  name <address>"
+-	print "  alias <address> [alias]"
+-	print "  trusted <address> [yes/no]"
+-	print "  blocked <address> [yes/no]"
++	print("Usage: %s <command>" % (sys.argv[0]))
++	print("")
++	print("  list")
++	print("  services <address>")
++	print("  create <address>")
++	print("  remove <address|path>")
++	print("  disconnect <address>")
++	print("  discover <address> [pattern]")
++	print("  class <address>")
++	print("  name <address>")
++	print("  alias <address> [alias]")
++	print("  trusted <address> [yes/no]")
++	print("  blocked <address> [yes/no]")
+ 	sys.exit(1)
+ 
+ if (args[0] == "list"):
+@@ -51,23 +51,23 @@
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		properties = device.GetProperties()
+-		print "%s %s" % (properties["Address"], properties["Alias"])
++		print("%s %s" % (properties["Address"], properties["Alias"]))
+ 
+ 	sys.exit(0)
+ 
+ def create_device_reply(device):
+-	print "New device (%s)" % device
++	print("New device (%s)" % device)
+ 	mainloop.quit()
+ 	sys.exit(0)
+ 
+ def create_device_error(error):
+-	print "Creating device failed: %s" % error
++	print("Creating device failed: %s" % error)
+ 	mainloop.quit()
+ 	sys.exit(1)
+ 
+ if (args[0] == "create"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		adapter.CreateDevice(args[1],
+ 				reply_handler=create_device_reply,
+@@ -76,7 +76,7 @@
+ 
+ if (args[0] == "remove"):
+ 	if (len(args) < 2):
+-		print "Need address or object path parameter"
++		print("Need address or object path parameter")
+ 	else:
+ 		try:
+ 			path = adapter.FindDevice(args[1])
+@@ -87,7 +87,7 @@
+ 
+ if (args[0] == "disconnect"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+@@ -97,7 +97,7 @@
+ 
+ if (args[0] == "discover"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+@@ -110,57 +110,57 @@
+ 		for key in services.keys():
+ 			p = re.compile(">.*?<")
+ 			xml = p.sub("><", services[key].replace("\n", ""))
+-			print "[ 0x%5x ]" % (key)
+-			print xml
+-			print
++			print("[ 0x%5x ]" % (key))
++			print(xml)
++			print()
+ 	sys.exit(0)
+ 
+ if (args[0] == "class"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		properties = device.GetProperties()
+-		print "0x%06x" % (properties["Class"])
++		print("0x%06x" % (properties["Class"]))
+ 	sys.exit(0)
+ 
+ if (args[0] == "name"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		properties = device.GetProperties()
+-		print properties["Name"]
++		print(properties["Name"])
+ 	sys.exit(0)
+ 
+ if (args[0] == "alias"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		if (len(args) < 3):
+ 			properties = device.GetProperties()
+-			print properties["Alias"]
++			print(properties["Alias"])
+ 		else:
+ 			device.SetProperty("Alias", args[2])
+ 	sys.exit(0)
+ 
+ if (args[0] == "trusted"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		if (len(args) < 3):
+ 			properties = device.GetProperties()
+-			print properties["Trusted"]
++			print(properties["Trusted"])
+ 		else:
+ 			if (args[2] == "yes"):
+ 				value = dbus.Boolean(1)
+@@ -173,14 +173,14 @@
+ 
+ if (args[0] == "blocked"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		if (len(args) < 3):
+ 			properties = device.GetProperties()
+-			print properties["Blocked"]
++			print(properties["Blocked"])
+ 		else:
+ 			if (args[2] == "yes"):
+ 				value = dbus.Boolean(1)
+@@ -193,15 +193,15 @@
+ 
+ if (args[0] == "services"):
+ 	if (len(args) < 2):
+-		print "Need address parameter"
++		print("Need address parameter")
+ 	else:
+ 		path = adapter.FindDevice(args[1])
+ 		device = dbus.Interface(bus.get_object("org.bluez", path),
+ 							"org.bluez.Device")
+ 		properties = device.GetProperties()
+ 		for path in properties["Services"]:
+-			print path
++			print(path)
+ 	sys.exit(0)
+ 
+-print "Unknown command"
++print("Unknown command")
+ sys.exit(1)
+Index: trunk/test/test-discovery
+===================================================================
+--- trunk.orig/test/test-discovery
++++ trunk/test/test-discovery
+@@ -1,20 +1,20 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+-import gobject
++from gi.repository import GObject
+ 
+ import dbus
+ import dbus.mainloop.glib
+ from optparse import OptionParser, make_option
+ 
+ def device_found(address, properties):
+-	print "[ " + address + " ]"
++	print("[ " + address + " ]")
+ 
+ 	for key in properties.keys():
+ 		value = properties[key]
+ 		if (key == "Class"):
+-			print "    %s = 0x%06x" % (key, value)
++			print("    %s = 0x%06x" % (key, value))
+ 		else:
+-			print "    %s = %s" % (key, value)
++			print("    %s = %s" % (key, value))
+ 
+ def property_changed(name, value):
+ 	if (name == "Discovering" and not value):
+@@ -53,5 +53,5 @@
+ 
+ 	adapter.StartDiscovery()
+ 
+-	mainloop = gobject.MainLoop()
++	mainloop = GObject.MainLoop()
+ 	mainloop.run()
+Index: trunk/test/test-health
+===================================================================
+--- trunk.orig/test/test-health
++++ trunk/test/test-health
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ import dbus
+Index: trunk/test/test-health-sink
+===================================================================
+--- trunk.orig/test/test-health-sink
++++ trunk/test/test-health-sink
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ 
+ import dbus
+Index: trunk/test/test-input
+===================================================================
+--- trunk.orig/test/test-input
++++ trunk/test/test-input
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+@@ -25,11 +25,11 @@
+ 							"org.bluez.Adapter")
+ 
+ if len(args) < 2:
+-	print """Usage: %s <command>
++	print("""Usage: %s <command>
+ 
+ 	connect <bdaddr>
+ 	disconnect <bdaddr>
+-	""" % sys.argv[0]
++	""" % sys.argv[0])
+ 	sys.exit(1)
+ 
+ device = adapter.FindDevice(args[1])
+@@ -41,5 +41,5 @@
+ elif args[0] == "disconnect":
+ 	input.Disconnect()
+ else:
+-	print "Unknown command"
++	print("Unknown command")
+ 	sys.exit(1)
+Index: trunk/test/test-manager
+===================================================================
+--- trunk.orig/test/test-manager
++++ trunk/test/test-manager
+@@ -1,18 +1,18 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+-import gobject
++from gi.repository import GObject
+ 
+ import dbus
+ import dbus.mainloop.glib
+ 
+ def adapter_added(path):
+-	print "Adapter with path %s added" % (path)
++	print("Adapter with path %s added" % (path))
+ 
+ def adapter_removed(path):
+-	print "Adapter with path %s removed" % (path)
++	print("Adapter with path %s removed" % (path))
+ 
+ def default_changed(path):
+-	print "Default adapter is now at path %s" % (path)
++	print("Default adapter is now at path %s" % (path))
+ 
+ if __name__ == "__main__":
+ 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+@@ -34,5 +34,5 @@
+ 	except:
+ 		pass
+ 
+-	mainloop = gobject.MainLoop()
++	mainloop = GObject.MainLoop()
+ 	mainloop.run()
+Index: trunk/test/test-network
+===================================================================
+--- trunk.orig/test/test-network
++++ trunk/test/test-network
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import time
+@@ -27,7 +27,7 @@
+ 							"org.bluez.Adapter")
+ 
+ if (len(args) < 1):
+-	print "Usage: %s <address> [service]" % (sys.argv[0])
++	print("Usage: %s <address> [service]" % (sys.argv[0]))
+ 	sys.exit(1)
+ 
+ address = args[0]
+@@ -44,13 +44,13 @@
+ 
+ iface = network.Connect(service)
+ 
+-print "Connected %s to %s" % (device, address)
++print("Connected %s to %s" % (device, address))
+ 
+-print "Press CTRL-C to disconnect"
++print("Press CTRL-C to disconnect")
+ 
+ try:
+ 	time.sleep(1000)
+-	print "Terminating connection"
++	print("Terminating connection")
+ except:
+ 	pass
+ 
+Index: trunk/test/test-oob
+===================================================================
+--- trunk.orig/test/test-oob
++++ trunk/test/test-oob
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import gobject
+ 
+Index: trunk/test/test-proximity
+===================================================================
+--- trunk.orig/test/test-proximity
++++ trunk/test/test-proximity
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ '''
+ Proximity Monitor test script
+Index: trunk/test/test-sap-server
+===================================================================
+--- trunk.orig/test/test-sap-server
++++ trunk/test/test-sap-server
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ from sap import *
+ import time
+Index: trunk/test/test-serial
+===================================================================
+--- trunk.orig/test/test-serial
++++ trunk/test/test-serial
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import time
+@@ -26,7 +26,7 @@
+ 							"org.bluez.Adapter")
+ 
+ if (len(args) < 1):
+-	print "Usage: %s <address> [service]" % (sys.argv[0])
++	print("Usage: %s <address> [service]" % (sys.argv[0]))
+ 	sys.exit(1)
+ 
+ address = args[0]
+@@ -43,13 +43,13 @@
+ 
+ node = serial.Connect(service)
+ 
+-print "Connected %s to %s" % (node, address)
++print("Connected %s to %s" % (node, address))
+ 
+-print "Press CTRL-C to disconnect"
++print("Press CTRL-C to disconnect")
+ 
+ try:
+ 	time.sleep(1000)
+-	print "Terminating connection"
++	print("Terminating connection")
+ except:
+ 	pass
+ 
+Index: trunk/test/test-serial-proxy
+===================================================================
+--- trunk.orig/test/test-serial-proxy
++++ trunk/test/test-serial-proxy
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import time
+Index: trunk/test/test-service
+===================================================================
+--- trunk.orig/test/test-service
++++ trunk/test/test-service
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+@@ -26,22 +26,22 @@
+ 						"org.bluez.Service")
+ 
+ if (len(args) < 1):
+-	print "Usage: %s <command>" % (sys.argv[0])
+-	print ""
+-	print "  addrecord <file>"
++	print("Usage: %s <command>" % (sys.argv[0]))
++	print("")
++	print("  addrecord <file>")
+ 	sys.exit(1)
+ 
+ if (args[0] == "addrecord"):
+ 	if (len(args) < 2):
+-		print "Need file parameter"
++		print("Need file parameter")
+ 	else:
+ 		f = open(args[1])
+ 		record = f.read()
+ 		f.close()
+ 		handle = service.AddRecord(record)
+-		print "0x%x" % (handle)
++		print("0x%x" % (handle))
+ 		time.sleep(120)
+ 	sys.exit(0)
+ 
+-print "Unknown command"
++print("Unknown command")
+ sys.exit(1)
+Index: trunk/test/test-telephony
+===================================================================
+--- trunk.orig/test/test-telephony
++++ trunk/test/test-telephony
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ import sys
+ import dbus
+@@ -28,7 +28,7 @@
+ 			"org.bluez.TelephonyTest")
+ 
+ if len(args) < 1:
+-	print """Usage: %s <command>
++	print("""Usage: %s <command>
+ 
+ 	connect <bdaddr>
+ 	disconnect <bdaddr>
+@@ -44,12 +44,12 @@
+ 	microphonegain <bdaddr> [level]
+ 	play <bdaddr>
+ 	stop <bdaddr>
+-	""" % sys.argv[0]
++	""" % sys.argv[0])
+ 	sys.exit(1)
+ 
+ if args[0] == "connect":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -59,7 +59,7 @@
+ 
+ if args[0] == "disconnect":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -69,7 +69,7 @@
+ 
+ if args[0] == "speakergain":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -78,13 +78,13 @@
+ 		headset.SetProperty('SpeakerGain', dbus.UInt16(args[2]))
+ 	else:
+ 		props = headset.GetProperties()
+-		print props['SpeakerGain']
++		print(props['SpeakerGain'])
+ 
+ 	sys.exit(0)
+ 
+ if args[0] == "microphonegain":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -93,13 +93,13 @@
+ 		headset.SetProperty('MicrophoneGain', dbus.UInt16(args[2]))
+ 	else:
+ 		props = headset.GetProperties()
+-		print props['MicrophoneGain']
++		print(props['MicrophoneGain'])
+ 
+ 	sys.exit(0)
+ 
+ if args[0] == "play":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -110,7 +110,7 @@
+ 
+ if args[0] == "stop":
+ 	if len(args) < 2:
+-		print "Need device address parameter"
++		print("Need device address parameter")
+ 		sys.exit(1)
+ 	device = adapter.FindDevice(args[1])
+ 	headset = dbus.Interface(bus.get_object("org.bluez", device),
+@@ -123,14 +123,14 @@
+ 	if len(args) > 1:
+ 		test.OutgoingCall(args[1])
+ 	else:
+-		print "Need number parameter"
++		print("Need number parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "incoming":
+ 	if len(args) > 1:
+ 		test.IncomingCall(args[1])
+ 	else:
+-		print "Need number parameter"
++		print("Need number parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "cancel":
+@@ -141,36 +141,36 @@
+ 	if len(args) > 1:
+ 		test.SignalStrength(args[1])
+ 	else:
+-		print "Need signal strength parameter"
++		print("Need signal strength parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "battery":
+ 	if len(args) > 1:
+ 		test.BatteryLevel(args[1])
+ 	else:
+-		print "Need battery level parameter"
++		print("Need battery level parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "roaming":
+ 	if len(args) > 1:
+ 		test.RoamingStatus(args[1] == "yes" or False)
+ 	else:
+-		print "Need yes/no parameter"
++		print("Need yes/no parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "registration":
+ 	if len(args) > 1:
+ 		test.RegistrationStatus(args[1] == "yes" or False)
+ 	else:
+-		print "Need yes/no parameter"
++		print("Need yes/no parameter")
+ 	sys.exit(0)
+ 
+ if args[0] == "subscriber":
+ 	if len(args) > 1:
+ 		test.SetSubscriberNumber(args[1])
+ 	else:
+-		print "Need number parameter"
++		print("Need number parameter")
+ 	sys.exit(0)
+ 
+-print "Unknown command"
++print("Unknown command")
+ sys.exit(1)
+Index: trunk/test/test-thermometer
+===================================================================
+--- trunk.orig/test/test-thermometer
++++ trunk/test/test-thermometer
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ '''
+ Thermometer test script

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-21 15:27:57 +0000
+++ debian/patches/series	2012-04-27 03:38:31 +0000
@@ -9,3 +9,4 @@
 enable_audio_profiles.patch
 10-unregister_interface_on_exit.patch
 11-explicitly_close.patch
+python3.patch

=== modified file 'debian/rules'
--- debian/rules	2012-02-22 10:51:07 +0000
+++ debian/rules	2012-04-27 03:38:31 +0000
@@ -71,5 +71,8 @@
 	install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
 		$(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
 
+common-install-arch::
+	dh_python3
+
 clean::
 	-rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev

=== modified file 'test/list-devices'
--- test/list-devices	2012-01-24 05:35:09 +0000
+++ test/list-devices	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 

=== modified file 'test/monitor-bluetooth'
--- test/monitor-bluetooth	2010-12-02 12:17:48 +0000
+++ test/monitor-bluetooth	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import gobject
 

=== modified file 'test/simple-agent'
--- test/simple-agent	2011-07-28 16:47:35 +0000
+++ test/simple-agent	2012-04-27 03:38:31 +0000
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GObject
 
 import sys
 import dbus
@@ -20,14 +20,14 @@
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="", out_signature="")
 	def Release(self):
-		print "Release"
+		print("Release")
 		if self.exit_on_release:
 			mainloop.quit()
 
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="os", out_signature="")
 	def Authorize(self, device, uuid):
-		print "Authorize (%s, %s)" % (device, uuid)
+		print("Authorize (%s, %s)" % (device, uuid))
 		authorize = raw_input("Authorize connection (yes/no): ")
 		if (authorize == "yes"):
 			return
@@ -36,25 +36,25 @@
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="o", out_signature="s")
 	def RequestPinCode(self, device):
-		print "RequestPinCode (%s)" % (device)
+		print("RequestPinCode (%s)" % (device))
 		return raw_input("Enter PIN Code: ")
 
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="o", out_signature="u")
 	def RequestPasskey(self, device):
-		print "RequestPasskey (%s)" % (device)
+		print("RequestPasskey (%s)" % (device))
 		passkey = raw_input("Enter passkey: ")
 		return dbus.UInt32(passkey)
 
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="ou", out_signature="")
 	def DisplayPasskey(self, device, passkey):
-		print "DisplayPasskey (%s, %d)" % (device, passkey)
+		print("DisplayPasskey (%s, %d)" % (device, passkey))
 
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="ou", out_signature="")
 	def RequestConfirmation(self, device, passkey):
-		print "RequestConfirmation (%s, %d)" % (device, passkey)
+		print("RequestConfirmation (%s, %d)" % (device, passkey))
 		confirm = raw_input("Confirm passkey (yes/no): ")
 		if (confirm == "yes"):
 			return
@@ -63,7 +63,7 @@
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="s", out_signature="")
 	def ConfirmModeChange(self, mode):
-		print "ConfirmModeChange (%s)" % (mode)
+		print("ConfirmModeChange (%s)" % (mode))
 		authorize = raw_input("Authorize mode change (yes/no): ")
 		if (authorize == "yes"):
 			return
@@ -72,14 +72,14 @@
 	@dbus.service.method("org.bluez.Agent",
 					in_signature="", out_signature="")
 	def Cancel(self):
-		print "Cancel"
+		print("Cancel")
 
 def create_device_reply(device):
-	print "New device (%s)" % (device)
+	print("New device (%s)" % (device))
 	mainloop.quit()
 
 def create_device_error(error):
-	print "Creating device failed: %s" % (error)
+	print("Creating device failed: %s" % (error))
 	mainloop.quit()
 
 if __name__ == '__main__':
@@ -109,7 +109,7 @@
 	path = "/test/agent"
 	agent = Agent(bus, path)
 
-	mainloop = gobject.MainLoop()
+	mainloop = GObject.MainLoop()
 
 	if len(args) > 1:
 		if len(args) > 2:
@@ -122,9 +122,10 @@
 					error_handler=create_device_error)
 	else:
 		adapter.RegisterAgent(path, capability)
-		print "Agent registered"
+		print("Agent registered")
 
 	mainloop.run()
 
 	#adapter.UnregisterAgent(path)
-	#print "Agent unregistered"
+	#print("Agent unregistered")
+

=== modified file 'test/simple-endpoint'
--- test/simple-endpoint	2010-12-02 12:17:48 +0000
+++ test/simple-endpoint	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus

=== modified file 'test/simple-service'
--- test/simple-service	2008-10-07 12:10:29 +0000
+++ test/simple-service	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import time
@@ -114,13 +114,13 @@
 
 handle = service.AddRecord(xml)
 
-print "Service record with handle 0x%04x added" % (handle)
+print("Service record with handle 0x%04x added" % (handle))
 
-print "Press CTRL-C to remove service record"
+print("Press CTRL-C to remove service record")
 
 try:
 	time.sleep(1000)
-	print "Terminating session"
+	print("Terminating session")
 except:
 	pass
 

=== modified file 'test/test-adapter'
--- test/test-adapter	2012-02-22 10:51:07 +0000
+++ test/test-adapter	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -26,28 +26,28 @@
 							"org.bluez.Adapter")
 
 if (len(args) < 1):
-	print "Usage: %s <command>" % (sys.argv[0])
-	print ""
-	print "  address"
-	print "  list"
-	print "  name [name]"
-	print "  powered [on/off]"
-	print "  pairable [on/off]"
-	print "  pairabletimeout [timeout]"
-	print "  discoverable [on/off]"
-	print "  discoverabletimeout [timeout]"
-	print "  discovering"
+	print("Usage: %s <command>" % (sys.argv[0]))
+	print("")
+	print("  address")
+	print("  list")
+	print("  name [name]")
+	print("  powered [on/off]")
+	print("  pairable [on/off]")
+	print("  pairabletimeout [timeout]")
+	print("  discoverable [on/off]")
+	print("  discoverabletimeout [timeout]")
+	print("  discovering")
 	sys.exit(1)
 
 if (args[0] == "address"):
 	properties = adapter.GetProperties()
-	print properties["Address"]
+	print(properties["Address"])
 	sys.exit(0)
 
 if (args[0] == "name"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["Name"]
+		print(properties["Name"])
 	else:
 		adapter.SetProperty("Name", args[1])
 	sys.exit(0)
@@ -59,19 +59,19 @@
 			adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
 								"org.bluez.Adapter")
 			prop = adapter.GetProperties()
-			print " [ %s ]" % (adapter_path)
-			for (key, value) in prop.iteritems():
+			print(" [ %s ]" % (adapter_path))
+			for (key, value) in prop.items():
 				if (key == "Class"):
-					print "    %s = 0x%06x" % (key, value)
+					print("    %s = 0x%06x" % (key, value))
 				else:
-					print "    %s = %s" % (key, value)
-			print
+					print("    %s = %s" % (key, value))
+			print()
 	sys.exit(0)
 
 if (args[0] == "powered"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["Powered"]
+		print(properties["Powered"])
 	else:
 		if (args[1] == "on"):
 			value = dbus.Boolean(1)
@@ -85,7 +85,7 @@
 if (args[0] == "pairable"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["Pairable"]
+		print(properties["Pairable"])
 	else:
 		if (args[1] == "on"):
 			value = dbus.Boolean(1)
@@ -99,7 +99,7 @@
 if (args[0] == "pairabletimeout"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["PairableTimeout"]
+		print(properties["PairableTimeout"])
 	else:
 		timeout = dbus.UInt32(args[1])
 		adapter.SetProperty("PairableTimeout", timeout)
@@ -108,7 +108,7 @@
 if (args[0] == "discoverable"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["Discoverable"]
+		print(properties["Discoverable"])
 	else:
 		if (args[1] == "on"):
 			value = dbus.Boolean(1)
@@ -122,7 +122,7 @@
 if (args[0] == "discoverabletimeout"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()
-		print properties["DiscoverableTimeout"]
+		print(properties["DiscoverableTimeout"])
 	else:
 		timeout = dbus.UInt32(args[1])
 		adapter.SetProperty("DiscoverableTimeout", timeout)
@@ -130,8 +130,8 @@
 
 if (args[0] == "discovering"):
 	properties = adapter.GetProperties()
-	print properties["Discovering"]
+	print(properties["Discovering"])
 	sys.exit(0)
 
-print "Unknown command"
+print("Unknown command")
 sys.exit(1)

=== modified file 'test/test-attrib'
--- test/test-attrib	2011-03-24 10:27:09 +0000
+++ test/test-attrib	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Script for testing the Attribute D-Bus API
 
 import sys

=== modified file 'test/test-audio'
--- test/test-audio	2010-12-20 14:59:20 +0000
+++ test/test-audio	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -25,11 +25,11 @@
 							"org.bluez.Adapter")
 
 if len(args) < 2:
-	print """Usage: %s <command>
+	print("""Usage: %s <command>
 
 	connect <bdaddr>
 	disconnect <bdaddr>
-	""" % sys.argv[0]
+	""" % sys.argv[0])
 	sys.exit(1)
 
 device = adapter.FindDevice(args[1])
@@ -41,5 +41,5 @@
 elif args[0] == "disconnect":
 	audio.Disconnect()
 else:
-	print "Unknown command"
+	print("Unknown command")
 	sys.exit(1)

=== modified file 'test/test-device'
--- test/test-device	2011-01-07 13:21:49 +0000
+++ test/test-device	2012-04-27 03:38:31 +0000
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GObject
 
 import sys
 import dbus
@@ -10,7 +10,7 @@
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 bus = dbus.SystemBus()
-mainloop = gobject.MainLoop()
+mainloop = GObject.MainLoop()
 
 manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
 
@@ -31,19 +31,19 @@
 							"org.bluez.Adapter")
 
 if (len(args) < 1):
-	print "Usage: %s <command>" % (sys.argv[0])
-	print ""
-	print "  list"
-	print "  services <address>"
-	print "  create <address>"
-	print "  remove <address|path>"
-	print "  disconnect <address>"
-	print "  discover <address> [pattern]"
-	print "  class <address>"
-	print "  name <address>"
-	print "  alias <address> [alias]"
-	print "  trusted <address> [yes/no]"
-	print "  blocked <address> [yes/no]"
+	print("Usage: %s <command>" % (sys.argv[0]))
+	print("")
+	print("  list")
+	print("  services <address>")
+	print("  create <address>")
+	print("  remove <address|path>")
+	print("  disconnect <address>")
+	print("  discover <address> [pattern]")
+	print("  class <address>")
+	print("  name <address>")
+	print("  alias <address> [alias]")
+	print("  trusted <address> [yes/no]")
+	print("  blocked <address> [yes/no]")
 	sys.exit(1)
 
 if (args[0] == "list"):
@@ -51,23 +51,23 @@
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		properties = device.GetProperties()
-		print "%s %s" % (properties["Address"], properties["Alias"])
+		print("%s %s" % (properties["Address"], properties["Alias"]))
 
 	sys.exit(0)
 
 def create_device_reply(device):
-	print "New device (%s)" % device
+	print("New device (%s)" % device)
 	mainloop.quit()
 	sys.exit(0)
 
 def create_device_error(error):
-	print "Creating device failed: %s" % error
+	print("Creating device failed: %s" % error)
 	mainloop.quit()
 	sys.exit(1)
 
 if (args[0] == "create"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		adapter.CreateDevice(args[1],
 				reply_handler=create_device_reply,
@@ -76,7 +76,7 @@
 
 if (args[0] == "remove"):
 	if (len(args) < 2):
-		print "Need address or object path parameter"
+		print("Need address or object path parameter")
 	else:
 		try:
 			path = adapter.FindDevice(args[1])
@@ -87,7 +87,7 @@
 
 if (args[0] == "disconnect"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
@@ -97,7 +97,7 @@
 
 if (args[0] == "discover"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
@@ -110,57 +110,57 @@
 		for key in services.keys():
 			p = re.compile(">.*?<")
 			xml = p.sub("><", services[key].replace("\n", ""))
-			print "[ 0x%5x ]" % (key)
-			print xml
-			print
+			print("[ 0x%5x ]" % (key))
+			print(xml)
+			print()
 	sys.exit(0)
 
 if (args[0] == "class"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		properties = device.GetProperties()
-		print "0x%06x" % (properties["Class"])
+		print("0x%06x" % (properties["Class"]))
 	sys.exit(0)
 
 if (args[0] == "name"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		properties = device.GetProperties()
-		print properties["Name"]
+		print(properties["Name"])
 	sys.exit(0)
 
 if (args[0] == "alias"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		if (len(args) < 3):
 			properties = device.GetProperties()
-			print properties["Alias"]
+			print(properties["Alias"])
 		else:
 			device.SetProperty("Alias", args[2])
 	sys.exit(0)
 
 if (args[0] == "trusted"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		if (len(args) < 3):
 			properties = device.GetProperties()
-			print properties["Trusted"]
+			print(properties["Trusted"])
 		else:
 			if (args[2] == "yes"):
 				value = dbus.Boolean(1)
@@ -173,14 +173,14 @@
 
 if (args[0] == "blocked"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		if (len(args) < 3):
 			properties = device.GetProperties()
-			print properties["Blocked"]
+			print(properties["Blocked"])
 		else:
 			if (args[2] == "yes"):
 				value = dbus.Boolean(1)
@@ -193,15 +193,15 @@
 
 if (args[0] == "services"):
 	if (len(args) < 2):
-		print "Need address parameter"
+		print("Need address parameter")
 	else:
 		path = adapter.FindDevice(args[1])
 		device = dbus.Interface(bus.get_object("org.bluez", path),
 							"org.bluez.Device")
 		properties = device.GetProperties()
 		for path in properties["Services"]:
-			print path
+			print(path)
 	sys.exit(0)
 
-print "Unknown command"
+print("Unknown command")
 sys.exit(1)

=== modified file 'test/test-discovery'
--- test/test-discovery	2010-12-20 14:59:20 +0000
+++ test/test-discovery	2012-04-27 03:38:31 +0000
@@ -1,20 +1,20 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GObject
 
 import dbus
 import dbus.mainloop.glib
 from optparse import OptionParser, make_option
 
 def device_found(address, properties):
-	print "[ " + address + " ]"
+	print("[ " + address + " ]")
 
 	for key in properties.keys():
 		value = properties[key]
 		if (key == "Class"):
-			print "    %s = 0x%06x" % (key, value)
+			print("    %s = 0x%06x" % (key, value))
 		else:
-			print "    %s = %s" % (key, value)
+			print("    %s = %s" % (key, value))
 
 def property_changed(name, value):
 	if (name == "Discovering" and not value):
@@ -53,5 +53,5 @@
 
 	adapter.StartDiscovery()
 
-	mainloop = gobject.MainLoop()
+	mainloop = GObject.MainLoop()
 	mainloop.run()

=== modified file 'test/test-health'
--- test/test-health	2012-01-24 05:35:09 +0000
+++ test/test-health	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 import dbus

=== modified file 'test/test-health-sink'
--- test/test-health-sink	2012-01-24 05:35:09 +0000
+++ test/test-health-sink	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 import dbus

=== modified file 'test/test-input'
--- test/test-input	2010-12-20 14:59:20 +0000
+++ test/test-input	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -25,11 +25,11 @@
 							"org.bluez.Adapter")
 
 if len(args) < 2:
-	print """Usage: %s <command>
+	print("""Usage: %s <command>
 
 	connect <bdaddr>
 	disconnect <bdaddr>
-	""" % sys.argv[0]
+	""" % sys.argv[0])
 	sys.exit(1)
 
 device = adapter.FindDevice(args[1])
@@ -41,5 +41,5 @@
 elif args[0] == "disconnect":
 	input.Disconnect()
 else:
-	print "Unknown command"
+	print("Unknown command")
 	sys.exit(1)

=== modified file 'test/test-manager'
--- test/test-manager	2010-12-02 12:17:48 +0000
+++ test/test-manager	2012-04-27 03:38:31 +0000
@@ -1,18 +1,18 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
-import gobject
+from gi.repository import GObject
 
 import dbus
 import dbus.mainloop.glib
 
 def adapter_added(path):
-	print "Adapter with path %s added" % (path)
+	print("Adapter with path %s added" % (path))
 
 def adapter_removed(path):
-	print "Adapter with path %s removed" % (path)
+	print("Adapter with path %s removed" % (path))
 
 def default_changed(path):
-	print "Default adapter is now at path %s" % (path)
+	print("Default adapter is now at path %s" % (path))
 
 if __name__ == "__main__":
 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -34,5 +34,5 @@
 	except:
 		pass
 
-	mainloop = gobject.MainLoop()
+	mainloop = GObject.MainLoop()
 	mainloop.run()

=== modified file 'test/test-network'
--- test/test-network	2010-12-20 14:59:20 +0000
+++ test/test-network	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import time
@@ -27,7 +27,7 @@
 							"org.bluez.Adapter")
 
 if (len(args) < 1):
-	print "Usage: %s <address> [service]" % (sys.argv[0])
+	print("Usage: %s <address> [service]" % (sys.argv[0]))
 	sys.exit(1)
 
 address = args[0]
@@ -44,13 +44,13 @@
 
 iface = network.Connect(service)
 
-print "Connected %s to %s" % (device, address)
+print("Connected %s to %s" % (device, address))
 
-print "Press CTRL-C to disconnect"
+print("Press CTRL-C to disconnect")
 
 try:
 	time.sleep(1000)
-	print "Terminating connection"
+	print("Terminating connection")
 except:
 	pass
 

=== modified file 'test/test-oob'
--- test/test-oob	2011-05-17 19:02:14 +0000
+++ test/test-oob	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import gobject
 

=== modified file 'test/test-proximity'
--- test/test-proximity	2012-01-24 05:35:09 +0000
+++ test/test-proximity	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 '''
 Proximity Monitor test script

=== modified file 'test/test-sap-server'
--- test/test-sap-server	2011-04-05 10:09:16 +0000
+++ test/test-sap-server	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from sap import *
 import time

=== modified file 'test/test-serial'
--- test/test-serial	2011-01-27 18:00:26 +0000
+++ test/test-serial	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import time
@@ -26,7 +26,7 @@
 							"org.bluez.Adapter")
 
 if (len(args) < 1):
-	print "Usage: %s <address> [service]" % (sys.argv[0])
+	print("Usage: %s <address> [service]" % (sys.argv[0]))
 	sys.exit(1)
 
 address = args[0]
@@ -43,13 +43,13 @@
 
 node = serial.Connect(service)
 
-print "Connected %s to %s" % (node, address)
+print("Connected %s to %s" % (node, address))
 
-print "Press CTRL-C to disconnect"
+print("Press CTRL-C to disconnect")
 
 try:
 	time.sleep(1000)
-	print "Terminating connection"
+	print("Terminating connection")
 except:
 	pass
 

=== modified file 'test/test-serial-proxy'
--- test/test-serial-proxy	2012-01-24 05:35:09 +0000
+++ test/test-serial-proxy	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import time

=== modified file 'test/test-service'
--- test/test-service	2011-01-27 18:00:26 +0000
+++ test/test-service	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -26,22 +26,22 @@
 						"org.bluez.Service")
 
 if (len(args) < 1):
-	print "Usage: %s <command>" % (sys.argv[0])
-	print ""
-	print "  addrecord <file>"
+	print("Usage: %s <command>" % (sys.argv[0]))
+	print("")
+	print("  addrecord <file>")
 	sys.exit(1)
 
 if (args[0] == "addrecord"):
 	if (len(args) < 2):
-		print "Need file parameter"
+		print("Need file parameter")
 	else:
 		f = open(args[1])
 		record = f.read()
 		f.close()
 		handle = service.AddRecord(record)
-		print "0x%x" % (handle)
+		print("0x%x" % (handle))
 		time.sleep(120)
 	sys.exit(0)
 
-print "Unknown command"
+print("Unknown command")
 sys.exit(1)

=== modified file 'test/test-telephony'
--- test/test-telephony	2011-01-27 18:00:26 +0000
+++ test/test-telephony	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import dbus
@@ -28,7 +28,7 @@
 			"org.bluez.TelephonyTest")
 
 if len(args) < 1:
-	print """Usage: %s <command>
+	print("""Usage: %s <command>
 
 	connect <bdaddr>
 	disconnect <bdaddr>
@@ -44,12 +44,12 @@
 	microphonegain <bdaddr> [level]
 	play <bdaddr>
 	stop <bdaddr>
-	""" % sys.argv[0]
+	""" % sys.argv[0])
 	sys.exit(1)
 
 if args[0] == "connect":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -59,7 +59,7 @@
 
 if args[0] == "disconnect":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -69,7 +69,7 @@
 
 if args[0] == "speakergain":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -78,13 +78,13 @@
 		headset.SetProperty('SpeakerGain', dbus.UInt16(args[2]))
 	else:
 		props = headset.GetProperties()
-		print props['SpeakerGain']
+		print(props['SpeakerGain'])
 
 	sys.exit(0)
 
 if args[0] == "microphonegain":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -93,13 +93,13 @@
 		headset.SetProperty('MicrophoneGain', dbus.UInt16(args[2]))
 	else:
 		props = headset.GetProperties()
-		print props['MicrophoneGain']
+		print(props['MicrophoneGain'])
 
 	sys.exit(0)
 
 if args[0] == "play":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -110,7 +110,7 @@
 
 if args[0] == "stop":
 	if len(args) < 2:
-		print "Need device address parameter"
+		print("Need device address parameter")
 		sys.exit(1)
 	device = adapter.FindDevice(args[1])
 	headset = dbus.Interface(bus.get_object("org.bluez", device),
@@ -123,14 +123,14 @@
 	if len(args) > 1:
 		test.OutgoingCall(args[1])
 	else:
-		print "Need number parameter"
+		print("Need number parameter")
 	sys.exit(0)
 
 if args[0] == "incoming":
 	if len(args) > 1:
 		test.IncomingCall(args[1])
 	else:
-		print "Need number parameter"
+		print("Need number parameter")
 	sys.exit(0)
 
 if args[0] == "cancel":
@@ -141,36 +141,36 @@
 	if len(args) > 1:
 		test.SignalStrength(args[1])
 	else:
-		print "Need signal strength parameter"
+		print("Need signal strength parameter")
 	sys.exit(0)
 
 if args[0] == "battery":
 	if len(args) > 1:
 		test.BatteryLevel(args[1])
 	else:
-		print "Need battery level parameter"
+		print("Need battery level parameter")
 	sys.exit(0)
 
 if args[0] == "roaming":
 	if len(args) > 1:
 		test.RoamingStatus(args[1] == "yes" or False)
 	else:
-		print "Need yes/no parameter"
+		print("Need yes/no parameter")
 	sys.exit(0)
 
 if args[0] == "registration":
 	if len(args) > 1:
 		test.RegistrationStatus(args[1] == "yes" or False)
 	else:
-		print "Need yes/no parameter"
+		print("Need yes/no parameter")
 	sys.exit(0)
 
 if args[0] == "subscriber":
 	if len(args) > 1:
 		test.SetSubscriberNumber(args[1])
 	else:
-		print "Need number parameter"
+		print("Need number parameter")
 	sys.exit(0)
 
-print "Unknown command"
+print("Unknown command")
 sys.exit(1)

=== modified file 'test/test-thermometer'
--- test/test-thermometer	2012-01-24 05:35:09 +0000
+++ test/test-thermometer	2012-04-27 03:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 '''
 Thermometer test script