Merge lp:~dobey/ubuntuone-dev-tools/twisted-regressed into lp:ubuntuone-dev-tools

[dobey]

New twisted breaks API, so update the code to deal with it.

[Mike McCracken (mikemc)]

looks good, tests run for me on trusty

review: Approve

=== modified file 'ubuntuone/devtools/testcases/tests/test_squid_testcase.py'
--- ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2013-02-08 19:38:02 +0000
+++ ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2014-01-10 20:05:28 +0000
@@ -35,6 +35,10 @@
 from ubuntuone.devtools.testcases import skipIfOS
 from ubuntuone.devtools.testcases.squid import SquidTestCase
 
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
 
 SAMPLE_RESOURCE = "<p>Hello World!</p>"
 SIMPLERESOURCE = "simpleresource"
@@ -82,7 +86,7 @@
 
     def _connect(self, url, contextFactory):
         """Perform the connection."""
-        scheme, _, _, _ = client._parse(url)
+        scheme, _, _, _, _, _ = urlparse(url)
         # pylint: disable=E1101
         if scheme == 'https':
             from twisted.internet import ssl
 
=== modified file 'ubuntuone/devtools/utils.py'
--- ubuntuone/devtools/utils.py	2012-08-13 15:18:00 +0000
+++ ubuntuone/devtools/utils.py	2014-01-10 20:05:28 +0000
@@ -135,10 +135,10 @@
         for _arg in _args:
             try:
                 if has_default:
-                    l_opt, s_opt, default, doc = unpack_padded(4, _arg)
+                    l_opt, s_opt, default, doc, _ = unpack_padded(5, _arg)
                 else:
                     default = False
-                    l_opt, s_opt, doc = unpack_padded(3, _arg)
+                    l_opt, s_opt, doc, _ = unpack_padded(4, _arg)
             except ValueError:
                 raise ValueError('Failed to parse argument: %s' % _arg)
             if not l_opt: