Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-bytes-formatting into lp:ubuntuone-dev-tools

[Brian Curtin]

- Remove byte string formatting, instead first formatting Unicode strings and then storing encoded bytes.

Python 3 byte strings do not have the ".format" method, so instead we should format a Unicode string and then encode it.

[Manuel de la Peña (mandel)]

review: Approve

[dobey (dobey)]

review: Approve

=== 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-08-28 21:31:22 +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):