Merge lp:~dobey/ubuntu-sso-client/fix-urlerror into lp:ubuntu-sso-client

[dobey]

Don't put 3 slashes in file URL when appending full path

[Natalia Bidart (nataliabidart)]

Thanks for the work on this.

While you're it, can you please fix this faulty docstring?

"""Return a fix captcha)."""

review: Approve

[lp:~dobey/ubuntu-sso-client/fix-urlerror]

729. By dobey on 2011-06-30

Fix the docstring as well

=== modified file 'ubuntu_sso/qt/tests/show_gui.py'
--- ubuntu_sso/qt/tests/show_gui.py	2011-06-23 15:58:26 +0000
+++ ubuntu_sso/qt/tests/show_gui.py	2011-06-30 00:31:31 +0000
@@ -23,11 +23,13 @@
 from twisted.internet.defer import inlineCallbacks
 from ubuntu_sso.main.windows import UbuntuSSOClient
 
+
 def found(*args):
     """The credentials were found."""
     print "creds found", args
     reactor.stop()
 
+
 @inlineCallbacks
 def main():
     """Perform a client request to be logged in."""
@@ -40,6 +42,7 @@
                                                     'This is a test.', 0)
     print "called ok"
 
+
 if __name__ == '__main__':
     main()
     reactor.run()

=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2011-03-30 11:20:02 +0000
+++ ubuntu_sso/tests/test_account.py	2011-06-30 00:31:31 +0000
@@ -51,8 +51,8 @@
     """Fake the captcha generator."""
 
     def new(self):
-        """Return a fix captcha)."""
-        return {'image_url': 'file:///%s' % CAPTCHA_PATH,
+        """Return a local fake captcha."""
+        return {'image_url': 'file://%s' % CAPTCHA_PATH,
                 'captcha_id': CAPTCHA_ID}