Merge lp:~brian.curtin/ubuntuone-dev-tools/py3-unicode-literals into lp:ubuntuone-dev-tools

[Brian Curtin]

- Enable unicode_literals for accurate text/bytes distinction to work with Python 3

Clear up some bytes/text distinctions that needed to be made for Python 3 support. Formerly explicit unicode literals are now covered by the unicode_literals future import and the names which are to be bytes are now explicit.

[lp:~brian.curtin/ubuntuone-dev-tools/py3-unicode-literals]

89. By Brian Curtin on 2012-08-21

forgot to put future import back in

[Alejandro J. Cura (alecu)]

Looks good now.

review: Approve

[Roberto Alsina (ralsina)]

Looks good to me.

review: Approve

=== modified file 'ubuntuone/devtools/testing/tests/test_txwebserver.py'
--- ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-04-17 15:53:14 +0000
+++ ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-08-21 21:38:18 +0000
@@ -28,6 +28,7 @@
 
 """Test the twisted webserver."""
 
+from __future__ import unicode_literals
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -36,13 +37,13 @@
 from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
 
-SAMPLE_KEY = "result"
-SAMPLE_VALUE = "sample result"
-SAMPLE_RESOURCE = '{{"{0}": "{1}"}}'.format(SAMPLE_KEY, SAMPLE_VALUE)
-SIMPLERESOURCE = "simpleresource"
-OTHER_SIMPLERESOURCE = "othersimpleresource"
-THROWERROR = "throwerror"
-UNAUTHORIZED = "unauthorized"
+SAMPLE_KEY = b"result"
+SAMPLE_VALUE = b"sample result"
+SAMPLE_RESOURCE = b'{{"{0}": "{1}"}}'.format(SAMPLE_KEY, SAMPLE_VALUE)
+SIMPLERESOURCE = b"simpleresource"
+OTHER_SIMPLERESOURCE = b"othersimpleresource"
+THROWERROR = b"throwerror"
+UNAUTHORIZED = b"unauthorized"
 
 # no init
 # pylint: disable=W0232
@@ -76,7 +77,7 @@
         root.putChild(UNAUTHORIZED, unauthorized_resource)
         self.server = HTTPWebServer(root)
         self.server.start()
-        self.uri = "http://127.0.0.1:{port}/".format(
+        self.uri = b"http://127.0.0.1:{port}/".format(
                                                    port=self.server.get_port())
         self.addCleanup(self.server.stop)
 
@@ -104,7 +105,7 @@
 
     def test_get_iri(self):
         """Test getting the iri from the server."""
-        expected = u"http://127.0.0.1:{port}/"
+        expected = "http://127.0.0.1:{port}/"
         self.assert_url(expected)
 
     def test_get_port(self):
@@ -133,7 +134,7 @@
 
     def get_uri(self, server):
         """Return the uri for the server."""
-        url = "http://127.0.0.1:{port}/"
+        url = b"http://127.0.0.1:{port}/"
         return url.format(port=server.get_port())
 
     @defer.inlineCallbacks

=== modified file 'ubuntuone/devtools/testing/txwebserver.py'
--- ubuntuone/devtools/testing/txwebserver.py	2012-04-26 11:23:19 +0000
+++ ubuntuone/devtools/testing/txwebserver.py	2012-08-21 21:38:18 +0000
@@ -28,6 +28,8 @@
 
 """A tx based web server."""
 
+from __future__ import unicode_literals
+
 from twisted.internet import defer, reactor, ssl
 from twisted.protocols.policies import WrappingFactory
 from twisted.web import server
@@ -65,7 +67,7 @@
 
     def get_iri(self):
         """Build the iri for this mock server."""
-        return u"{scheme}://127.0.0.1:{port}/".format(scheme=self.scheme,
+        return "{scheme}://127.0.0.1:{port}/".format(scheme=self.scheme,
                                                    port=self.get_port())
 
     def get_port(self):