Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-dbus-str into lp:ubuntuone-dev-tools

[Brian Curtin]

- Sort out dbus related bytes/string differences surrounding subprocess pipes, environment variables, and a dbus API expecting a str argument regardless of version.

subprocess pipes return byte strings, so implicit strings were converted to explicitly be bytes in order to join on them with data from the pipe. Additionally, os.environ expects Unicode, so we decode the byte string that we joined from the pipe.

dbus.bus.BusConnection expects the first argument to be str regardless of version, so we explicitly give it an str. I added a comment there so we avoid trying to use any compatibility layer there, e.g., ubuntuone.devtools.compat which solves some str/bytes differences.

[Manuel de la Peña (mandel)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/devtools/services/dbus.py'
--- ubuntuone/devtools/services/dbus.py	2012-08-20 22:10:29 +0000
+++ ubuntuone/devtools/services/dbus.py	2012-08-28 21:59:18 +0000
@@ -29,6 +29,8 @@
 # files in the program, then also delete it here.
 """Utilities for finding and running a dbus session bus for testing."""
 
+from __future__ import unicode_literals
+
 import os
 import signal
 import subprocess
@@ -96,11 +98,12 @@
         # Call wait here as under the qt4 reactor we get an error about
         # interrupted system call if we don't.
         sp.wait()
-        self.dbus_address = "".join(sp.stdout.readlines()).strip()
-        self.dbus_pid = int("".join(sp.stderr.readlines()).strip())
+        self.dbus_address = b"".join(sp.stdout.readlines()).strip()
+        self.dbus_pid = int(b"".join(sp.stderr.readlines()).strip())
 
         if self.dbus_address != "":
-            os.environ["DBUS_SESSION_BUS_ADDRESS"] = self.dbus_address
+            os.environ["DBUS_SESSION_BUS_ADDRESS"] = \
+                    self.dbus_address.decode("utf8")
         else:
             os.kill(self.dbus_pid, signal.SIGKILL)
             raise DBusLaunchError("There was a problem launching dbus-daemon.")

=== modified file 'ubuntuone/devtools/testcases/dbus.py'
--- ubuntuone/devtools/testcases/dbus.py	2012-08-21 18:51:05 +0000
+++ ubuntuone/devtools/testcases/dbus.py	2012-08-28 21:59:18 +0000
@@ -107,8 +107,12 @@
 
         # Set up the main loop and bus connection
         self.loop = DBusGMainLoop(set_as_default=True)
-        self.bus = dbus.bus.BusConnection(address_or_type=bus_address,
-                                          mainloop=self.loop)
+
+        # NOTE: The address_or_type value must remain explicitly as
+        # str instead of anything from ubuntuone.devtools.compat. dbus
+        # expects this to be str regardless of version.
+        self.bus = dbus.bus.BusConnection(address_or_type=str(bus_address),
+                    mainloop=self.loop)
 
         # Monkeypatch the dbus.SessionBus/SystemBus methods, to ensure we
         # always point at our own private bus instance.