Merge lp:~dobey/ubuntuone-dev-tools/update-4-0 into lp:ubuntuone-dev-tools/stable-4-0

[dobey]

[Brian Curtin]

    - Remove usage of Exception.message as it was deprecated and removed from Python 3. Check the exception's "args" attribute for the message.
    - Sort out dbus related bytes/string differences surrounding subprocess pipes, environment variables, and a dbus API expecting a str argument regardless of version.
    - Remove byte string formatting, instead first formatting Unicode strings and then storing encoded bytes.

[Eric Casteleijn (thisfred)]

looks good

review: Approve

[lp:~dobey/ubuntuone-dev-tools/update-4-0]

83. By dobey on 2012-09-11

[Brian Curtin]

    - Remove usage of Exception.message as it was deprecated and removed from Python 3. Check the exception's "args" attribute for the message.
    - Sort out dbus related bytes/string differences surrounding subprocess pipes, environment variables, and a dbus API expecting a str argument regardless of version.
    - Remove byte string formatting, instead first formatting Unicode strings and then storing encoded bytes.

=== 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-09-11 14:29:44 +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/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2012-08-21 20:10:20 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2012-09-11 14:29:44 +0000
@@ -376,5 +376,5 @@
         self.patch(self.runner, '_is_squid_running', lambda: False)
         ex = self.assertRaises(squid.SquidLaunchError,
                                self.runner.start_service)
-        self.assertTrue(out in ex.message)
-        self.assertTrue(err in ex.message)
+        self.assertTrue(any([out in arg.encode("utf8") for arg in ex.args]))
+        self.assertTrue(any([err in arg.encode("utf8") for arg in ex.args]))

=== 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-09-11 14:29:44 +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.

=== modified file 'ubuntuone/devtools/testing/tests/test_txwebserver.py'
--- ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-08-21 20:55:43 +0000
+++ ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-09-11 14:29:44 +0000
@@ -39,7 +39,8 @@
 
 SAMPLE_KEY = b"result"
 SAMPLE_VALUE = b"sample result"
-SAMPLE_RESOURCE = b'{{"{0}": "{1}"}}'.format(SAMPLE_KEY, SAMPLE_VALUE)
+SAMPLE_RESOURCE = '{{"{0}": "{1}"}}'.format(
+                    SAMPLE_KEY, SAMPLE_VALUE).encode("utf8")
 SIMPLERESOURCE = b"simpleresource"
 OTHER_SIMPLERESOURCE = b"othersimpleresource"
 THROWERROR = b"throwerror"
@@ -77,8 +78,8 @@
         root.putChild(UNAUTHORIZED, unauthorized_resource)
         self.server = HTTPWebServer(root)
         self.server.start()
-        self.uri = b"http://127.0.0.1:{port}/".format(
-                                                   port=self.server.get_port())
+        self.uri = "http://127.0.0.1:{port}/".format(
+                        port=self.server.get_port()).encode("utf8")
         self.addCleanup(self.server.stop)
 
     @defer.inlineCallbacks
@@ -134,8 +135,8 @@
 
     def get_uri(self, server):
         """Return the uri for the server."""
-        url = b"http://127.0.0.1:{port}/"
-        return url.format(port=server.get_port())
+        url = "http://127.0.0.1:{port}/"
+        return url.format(port=server.get_port()).encode("utf8")
 
     @defer.inlineCallbacks
     def test_single_request(self):