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

[Brian Curtin]

- Import StringIO from the io module for Python 3 compatibility

Python 3 no longer has a StringIO module, instead getting the StringIO class from the io module which was backported to Python 2 as well. We can have 2 and 3 friendly code by importing StringIO from io regardless of version, and by using unicode_literals as well.

[Alejandro J. Cura (alecu)]

The StringIO derived instance in this code is used as a fake Popen.PIPE.
But those pipes in python 3 still return bytes, so it should be BytesIO in that case.
Also, the literals used by the related testing functions should be changed to bytes literals in this branch.

review: Needs Fixing

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

83. By Brian Curtin on 2012-08-21

Use BytesIO and byte literals

[Alejandro J. Cura (alecu)]

Looks good to me.

review: Approve

=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2012-04-24 17:58:16 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2012-08-21 20:14:36 +0000
@@ -30,7 +30,7 @@
 import json
 import os
 
-from StringIO import StringIO
+from io import BytesIO
 
 from twisted.internet import defer
 
@@ -237,7 +237,7 @@
         self._assert_missing_binary('htpasswd')
 
 
-class Pipe(StringIO):
+class Pipe(BytesIO):
     """A read write pipe."""
 
     def read(self):
@@ -364,8 +364,8 @@
     def test_start_error(self):
         """Test that we do raise an exception correctly."""
         # set the error in the pipes
-        out = 'Normal out'
-        err = 'Error goes here'
+        out = b'Normal out'
+        err = b'Error goes here'
         self.subprocess.stdout.write(out)
         self.subprocess.stderr.write(err)
         no_op = lambda _: None