Merge lp:~brian.curtin/ubuntu-sso-client/py3-StringIO into lp:ubuntu-sso-client

[Brian Curtin]

Import the StringIO class in a Python 2 and 3 way

Python 3 moved the StringIO class from the StringIO module to the io module. First try to import it from io, then fall back to StringIO.

[Alejandro J. Cura (alecu)]

It seems that io.StringIO exists in 2.7, and it's incompatible from StringIO:

----

[ERROR]
Traceback (most recent call last):
  File "/home/alecu/canonical/ubuntu-sso-client/review_py3-StringIO/ubuntu_sso/utils/tests/test_parse_args.py", line 97, in test_parse_args_app_name_is_required
    main.parse_args()
  File "/home/alecu/canonical/ubuntu-sso-client/review_py3-StringIO/ubuntu_sso/utils/ui.py", line 261, in parse_args
    args = parser.parse_args()
  File "/usr/lib/python2.7/argparse.py", line 1688, in parse_args
    args, argv = self.parse_known_args(args, namespace)
  File "/usr/lib/python2.7/argparse.py", line 1720, in parse_known_args
    namespace, args = self._parse_known_args(args, namespace)
  File "/usr/lib/python2.7/argparse.py", line 1944, in _parse_known_args
    self.error(_('argument %s is required') % name)
  File "/usr/lib/python2.7/argparse.py", line 2346, in error
    self.print_usage(_sys.stderr)
  File "/usr/lib/python2.7/argparse.py", line 2308, in print_usage
    self._print_message(self.format_usage(), file)
  File "/usr/lib/python2.7/argparse.py", line 2327, in _print_message
    file.write(message)
exceptions.TypeError: unicode argument expected, got 'str'

ubuntu_sso.utils.tests.test_parse_args.ParseArgsTestCase.test_parse_args_app_name_is_required

----

Please make sure to run the tests on 2 after each of these branches.

review: Needs Fixing

[Brian Curtin (brian.curtin)]

All of the above changes have this fixed.

[dobey (dobey)]

I think using io.StringIO here is correct even in 2.7, with the try/except. The test error from alecu seems to be that we also need to do from __future__ import unicode_literals as part of the work to port to python3, and it would likely solve the problem in the test; though opens another can of worms which we also need to deal with. Perhaps we can do some of that in this branch?

[lp:~brian.curtin/ubuntu-sso-client/py3-StringIO]

984. By Brian Curtin on 2012-07-02

Use StringIO from the io module regardless of version (since it was introduced in 2.6 and that's our minimum version). Additionally use unicode_literals in test_parse_args

[Brian Curtin (brian.curtin)]

Good point. I have other branches that are covering unicode by itself, but moving to always using io.StringIO regardless of version and adding the unicode_literals import to the test seem to solve this.

We can remove the if/else and try/except because if we're only supporting 2.6+ and 3, io.StringIO is always there.

[lp:~brian.curtin/ubuntu-sso-client/py3-StringIO]

985. By Brian Curtin on 2012-07-03

Remove sys import

[Alejandro J. Cura (alecu)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-06-22 16:55:35 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-07-03 21:32:20 +0000
@@ -28,9 +28,9 @@
 # files in the program, then also delete it here.
 """Customized Setup Account page for SSO."""
 
-import StringIO
 import tempfile
 import os
+from io import StringIO
 from functools import partial
 
 # pylint: disable=F0401
@@ -326,7 +326,7 @@
         # done either by a setParent or something within the qtreactor, PIL
         # in this case does solve the issue. Sorry :(
         pil_image = Image.open(self.captcha_file)
-        string_io = StringIO.StringIO()
+        string_io = StringIO()
         pil_image.save(string_io, format='png')
         pixmap_image = QtGui.QPixmap()
         pixmap_image.loadFromData(string_io.getvalue())

=== modified file 'ubuntu_sso/utils/tests/test_parse_args.py'
--- ubuntu_sso/utils/tests/test_parse_args.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/tests/test_parse_args.py	2012-07-03 21:32:20 +0000
@@ -28,9 +28,10 @@
 # files in the program, then also delete it here.
 """Tests for the parse_args function."""
 
+from __future__ import unicode_literals
+
 import sys
-
-from StringIO import StringIO
+from io import StringIO
 
 from twisted.trial.unittest import TestCase
 

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-06-22 21:04:49 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-07-03 21:32:20 +0000
@@ -29,8 +29,8 @@
 """A webclient backend that uses QtNetwork."""
 
 import sys
+from io import StringIO
 
-from StringIO import StringIO
 # pylint: disable=E0611
 from PyQt4.QtCore import (
     QBuffer,