Merge lp:~dobey/ubuntuone-dev-tools/update-4-2 into lp:ubuntuone-dev-tools/stable-4-2

[dobey]

Fix pep8 warnings that are newly presented in pep8 1.3

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-dev-tools/update-4-2 into lp:ubuntuone-dev-tools/stable-4-2 failed. Below is the output from the failed tests.

Starting squid version...
Waiting for squid to start....
Waiting for squid to start.....
ubuntuone.devtools.testing.tests.test_txwebserver
  MultipleWebServersTestCase
    test_multiple_requests ... [OK]
    test_single_request ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testing.tests.test_txwebserver
  WebServerTestCase
    test_get_iri ... [OK]
    test_get_port ... [OK]
    test_multiple_requests ... [OK]
    test_single_request ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]
ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_utils
  OptionParserTestCase
    test_get_flags_long_arg ... [OK]
    test_get_flags_short_arg ... [OK]
    test_get_params_combined_arg ... [OK]
    test_get_params_missing_arg ... [OK]
    test_get_params_short_arg ... [OK]
    test_get_params_split_arg ... [OK]
    test_unknown_option ... [OK]
ubuntuone.devtools.testcases.tests.te...

[lp:~dobey/ubuntuone-dev-tools/update-4-2]

99. By dobey on 2012-12-10

Fix pep8 warnings that are newly presented in pep8 1.3

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-10-18 21:17:22 +0000
+++ bin/u1lint	2012-11-29 21:41:22 +0000
@@ -162,7 +162,7 @@
 
         # pylint: disable=E1103
         return [os.path.join(SRCDIR, item) for item in
-                    config.get("MASTER", "ignore").split(",")]
+                config.get("MASTER", "ignore").split(",")]
     except (TypeError, configparser.NoOptionError):
         return []
     # pylint: enable=E1103
@@ -210,15 +210,13 @@
                 continue
 
             # Skip protobuf-generated and backup files
-            if (filename.endswith("_pb2.py")
-                or filename.endswith("~")
-                or filename.endswith(".bat")
-                ):
+            if filename.endswith("_pb2.py") \
+                    or filename.endswith("~") \
+                    or filename.endswith(".bat"):
                 continue
 
-            if (filename.endswith(".py")
-                or filepath.endswith("bin" + os.path.sep)
-                ):
+            if filename.endswith(".py") \
+                    or filepath.endswith("bin" + os.path.sep):
                 pyfiles.append(os.path.join(root, filename))
 
     pyfiles.sort()
@@ -231,14 +229,14 @@
     usage = '%prog [options]'
     parser = OptionParser(usage=usage)
     parser.add_option('-i', '--ignore', dest='ignored', default=None,
-                       help='comma-separated paths or files, to ignore')
+                      help='comma-separated paths or files, to ignore')
     (options, args) = parser.parse_args()
 
     failed = False
     ignored = _read_pylintrc_ignored()
     if options.ignored:
         ignored.extend([os.path.join(SRCDIR, item) for item in
-                            map(str.strip, options.ignored.split(','))])
+                        map(str.strip, options.ignored.split(','))])
 
     if os.environ.get('USE_PYFLAKES'):
         pylint_args = get_subprocess_start_info('pyflakes')
@@ -246,7 +244,7 @@
         pylint_args = get_subprocess_start_info('pylint')
         # append the extra args to the start info
         pylint_args.extend(['--output-format=parseable',
-            '--include-ids=yes'])
+                            '--include-ids=yes'])
         if PYLINTRC:
             pylint_args.append("--rcfile=" + PYLINTRC)
 
 
=== modified file 'setup.py'
--- setup.py	2012-07-26 21:13:55 +0000
+++ setup.py	2012-11-29 21:41:22 +0000
@@ -80,7 +80,7 @@
                   ('share/man/man1',
                    ['man/u1lint.1',
                     'man/u1trial.1']),
-                 ]
+                  ]
 
 setup(name=PACKAGE,
       version=VERSION,
@@ -96,7 +96,6 @@
       extra_path='ubuntuone-dev-tools',
       scripts=scripts,
       data_files=DATA_FILES,
-      cmdclass={
-        'lint': Lint,
-        },
+      cmdclass={'lint': Lint,
+                },
       )
 
=== modified file 'ubuntuone/devtools/handlers.py'
--- ubuntuone/devtools/handlers.py	2012-08-20 22:15:07 +0000
+++ ubuntuone/devtools/handlers.py	2012-11-29 21:41:22 +0000
@@ -90,8 +90,8 @@
     def check_exception(self, exception_info, *msgs):
         """Shortcut for checking exceptions."""
         for rec in self.records:
-            if (rec.levelno == logging.ERROR and
-                all(m in rec.exc_text + rec.message for m in msgs) and
-                exception_info in rec.exc_info):
+            if rec.levelno == logging.ERROR and \
+                    all(m in rec.exc_text + rec.message for m in msgs) and \
+                    exception_info in rec.exc_info:
                 return True
         return False
 
=== modified file 'ubuntuone/devtools/runners/__init__.py'
--- ubuntuone/devtools/runners/__init__.py	2012-09-28 13:58:23 +0000
+++ ubuntuone/devtools/runners/__init__.py	2012-11-29 21:41:22 +0000
@@ -151,7 +151,7 @@
             for test in files:
                 filepath = os.path.join(root, test)
                 if test.endswith(".py") and test not in ignored_modules and \
-                    not _is_in_ignored_path(filepath, ignored_paths):
+                        not _is_in_ignored_path(filepath, ignored_paths):
                     self.source_files.append(filepath)
                     if test.startswith("test_"):
                         module_suite = self._load_unittest(filepath)
 
=== modified file 'ubuntuone/devtools/services/__init__.py'
--- ubuntuone/devtools/services/__init__.py	2012-04-25 10:27:12 +0000
+++ ubuntuone/devtools/services/__init__.py	2012-11-29 21:41:22 +0000
@@ -37,9 +37,9 @@
     """Find the first appropriate conf to use."""
     # In case we're running from within the source tree
     path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                            os.path.pardir, os.path.pardir,
-                                            os.path.pardir,
-                                            "data", in_config_file))
+                                        os.path.pardir, os.path.pardir,
+                                        os.path.pardir,
+                                        "data", in_config_file))
     if not os.path.exists(path):
         # Use the installed file in $pkgdatadir as source
         for path in load_data_paths("ubuntuone-dev-tools",
 
=== modified file 'ubuntuone/devtools/services/dbus.py'
--- ubuntuone/devtools/services/dbus.py	2012-08-28 21:28:15 +0000
+++ ubuntuone/devtools/services/dbus.py	2012-11-29 21:41:22 +0000
@@ -103,7 +103,7 @@
 
         if self.dbus_address != "":
             os.environ["DBUS_SESSION_BUS_ADDRESS"] = \
-                    self.dbus_address.decode("utf8")
+                self.dbus_address.decode("utf8")
         else:
             os.kill(self.dbus_pid, signal.SIGKILL)
             raise DBusLaunchError("There was a problem launching dbus-daemon.")
 
=== modified file 'ubuntuone/devtools/services/squid.py'
--- ubuntuone/devtools/services/squid.py	2012-08-20 21:20:50 +0000
+++ ubuntuone/devtools/services/squid.py	2012-11-29 21:41:22 +0000
@@ -225,13 +225,14 @@
         spool_path = _get_spool_temp_path(tempdir)
         squid_path = _get_squid_temp_path(tempdir)
         with open(self.config_file, 'w') as out_file:
-            out_file.write(template.safe_substitute(
-                              auth_file=self.auth_file,
-                              auth_process=self.auth_process,
-                              noauth_port_number=self.settings['noauth_port'],
-                              auth_port_number=self.settings['auth_port'],
-                              spool_temp=spool_path,
-                              squid_temp=squid_path))
+            out_file.write(
+                template.safe_substitute(
+                    auth_file=self.auth_file,
+                    auth_process=self.auth_process,
+                    noauth_port_number=self.settings['noauth_port'],
+                    auth_port_number=self.settings['auth_port'],
+                    spool_temp=spool_path,
+                    squid_temp=squid_path))
 
     def _generate_swap(self, config_file):
         """Generate the squid swap files."""
@@ -271,8 +272,8 @@
             try:
                 #  Do not use stdout=PIPE or stderr=PIPE with this function.
                 subprocess.check_call([self.squid] + squid_args,
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.PIPE)
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.PIPE)
                 return True
             except subprocess.CalledProcessError:
                 message += '.'
 
=== modified file 'ubuntuone/devtools/services/tests/test_dbus.py'
--- ubuntuone/devtools/services/tests/test_dbus.py	2012-08-20 22:10:29 +0000
+++ ubuntuone/devtools/services/tests/test_dbus.py	2012-11-29 21:41:22 +0000
@@ -47,14 +47,14 @@
     def test_dbus_session_is_running(self):
         """Test that dbus session is the private one we started."""
         bus_address = os.environ.get('DBUS_SESSION_BUS_ADDRESS', None)
-        self.assertEqual(os.path.dirname(
-                unquote(bus_address.split(',')[0].split('=')[1])),
-                         os.path.dirname(os.getcwd()))
+        self.assertEqual(
+            os.path.dirname(unquote(bus_address.split(',')[0].split('=')[1])),
+            os.path.dirname(os.getcwd()))
 
     def test_config_file_path(self):
         """Test that we loaded the config file from the local tree."""
-        expected = os.path.abspath(os.path.join(
-                self.tmpdir, 'dbus-session.conf'))
+        expected = os.path.abspath(
+            os.path.join(self.tmpdir, 'dbus-session.conf'))
         runner = DBusRunner()
         # pylint: disable=W0212
         os.makedirs(self.tmpdir)
 
=== modified file 'ubuntuone/devtools/services/tests/test_squid.py'
--- ubuntuone/devtools/services/tests/test_squid.py	2012-09-06 19:02:51 +0000
+++ ubuntuone/devtools/services/tests/test_squid.py	2012-11-29 21:41:22 +0000
@@ -187,7 +187,7 @@
         squid.store_proxy_settings(self.settings)
         self.assertTrue(('dumps', self.settings) in self.called)
         self.assertEqual(self.env[squid.PROXY_ENV_VAR],
-                json.dumps(self.settings))
+                         json.dumps(self.settings))
 
     def test_retrieve_proxy_settings(self):
         """Test reading the settings."""
@@ -223,7 +223,7 @@
         """Perform the assertion when a bin is missing."""
         self.assertRaises(squid.SquidLaunchError, squid.SquidRunner)
         self.assertTrue(('fake_find_executable', binary) in self.called,
-                self.called)
+                        self.called)
 
     def test_squid_missing(self):
         """Test when squid is missing."""
@@ -352,12 +352,13 @@
         self.runner._generate_config_file(self.tmpdir)
         # remove the generated file
         self.addCleanup(os.unlink, self.runner.config_file)
-        expected_parameters = ('safe_substitute', (),
-                dict(auth_file=self.runner.auth_file,
-                     noauth_port_number=self.port,
-                     auth_port_number=self.port,
-                     spool_temp=squid._get_spool_temp_path(self.tmpdir),
-                     squid_temp=squid._get_squid_temp_path(self.tmpdir)))
+        expected_parameters = \
+            ('safe_substitute', (),
+             dict(auth_file=self.runner.auth_file,
+                  noauth_port_number=self.port,
+                  auth_port_number=self.port,
+                  spool_temp=squid._get_spool_temp_path(self.tmpdir),
+                  squid_temp=squid._get_squid_temp_path(self.tmpdir)))
         self.assertTrue(expected_parameters, self.template.called[0])
         self.assertEqual(2, self.called.count(('fake_get_port',)))
 
 
=== modified file 'ubuntuone/devtools/testcases/__init__.py'
--- ubuntuone/devtools/testcases/__init__.py	2012-08-21 21:19:41 +0000
+++ ubuntuone/devtools/testcases/__init__.py	2012-11-29 21:41:22 +0000
@@ -64,7 +64,7 @@
     def decorator(test_item):
         """Decorate the test so that it is skipped."""
         if not (isinstance(test_item, type) and
-            issubclass(test_item, TestCase)):
+                issubclass(test_item, TestCase)):
 
             @wraps(test_item)
             def skip_wrapper(*args, **kwargs):
@@ -106,8 +106,8 @@
 def skipIfNotOS(current_os, reason):
     """Skip test we are not in a particular os."""
     if os:
-        if sys.platform not in current_os or\
-            sys.platform != current_os:
+        if sys.platform not in current_os or \
+                sys.platform != current_os:
             return skipTest(reason)
         return _id
     return _id
 
=== modified file 'ubuntuone/devtools/testcases/dbus.py'
--- ubuntuone/devtools/testcases/dbus.py	2012-10-18 21:17:22 +0000
+++ ubuntuone/devtools/testcases/dbus.py	2012-11-29 21:41:22 +0000
@@ -71,7 +71,7 @@
 
 
 @skipIf(dbus is None or service is None or DBusGMainLoop is None,
-    "The test requires dbus.")
+        "The test requires dbus.")
 class DBusTestCase(BaseTestCase):
     """Test the DBus event handling."""
 
@@ -110,7 +110,7 @@
         # str instead of anything from ubuntuone.devtools.compat. dbus
         # expects this to be str regardless of version.
         self.bus = dbus.bus.BusConnection(address_or_type=str(bus_address),
-                    mainloop=self.loop)
+                                          mainloop=self.loop)
 
         # Monkeypatch the dbus.SessionBus/SystemBus methods, to ensure we
         # always point at our own private bus instance.
 
=== modified file 'ubuntuone/devtools/testcases/tests/test_squid_testcase.py'
--- ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2012-04-24 17:58:16 +0000
+++ ubuntuone/devtools/testcases/tests/test_squid_testcase.py	2012-11-29 21:41:22 +0000
@@ -71,7 +71,7 @@
     """Provide useful web methods with proxy."""
 
     def __init__(self, proxy_url=None, proxy_port=None, username=None,
-            password=None):
+                 password=None):
         """Create a new instance with the proxy settings."""
         self.proxy_url = proxy_url
         self.proxy_port = proxy_port
@@ -105,8 +105,9 @@
             # we try to get the page using the basic auth
             auth = base64.b64encode('%s:%s' % (self.username, self.password))
             auth_header = 'Basic ' + auth.strip()
-            self.factory = ProxyClientFactory(self.proxy_url, self.proxy_port,
-                            url, headers={'Proxy-Authorization': auth_header})
+            self.factory = ProxyClientFactory(
+                self.proxy_url, self.proxy_port,
+                url, headers={'Proxy-Authorization': auth_header})
             self._connect(url, contextFactory)
             return self.factory.deferred
         else:
@@ -123,7 +124,7 @@
                                           headers={'Connection': 'close'})
         self._connect(url, contextFactory)
         self.factory.deferred.addErrback(self._process_auth_error, url,
-                                    contextFactory)
+                                         contextFactory)
         return self.factory.deferred
 
     @defer.inlineCallbacks
@@ -177,7 +178,8 @@
         root.putChild(THROWERROR, resource.NoResource())
 
         unauthorized_resource = resource.ErrorPage(resource.http.UNAUTHORIZED,
-                                                "Unauthorized", "Unauthorized")
+                                                   "Unauthorized",
+                                                   "Unauthorized")
         root.putChild(UNAUTHORIZED, unauthorized_resource)
 
         self.site = SaveSite(root)
@@ -221,9 +223,10 @@
         """Clean resources."""
         if self.proxy_client is not None:
             self.proxy_client.shutdown()
-            return defer.gatherResults([self.ws.stop(),
-                               self.proxy_client.shutdown(),
-                               self.proxy_client.factory.disconnected_d])
+            return defer.gatherResults(
+                [self.ws.stop(),
+                 self.proxy_client.shutdown(),
+                 self.proxy_client.factory.disconnected_d])
         else:
             return self.ws.stop()
 
@@ -234,8 +237,10 @@
 
     def access_auth_url(self, address, port, username, password):
         """Access a url throught the proxy."""
-        self.proxy_client = ProxyWebClient(proxy_url=address, proxy_port=port,
-                                         username=username, password=password)
+        self.proxy_client = ProxyWebClient(proxy_url=address,
+                                           proxy_port=port,
+                                           username=username,
+                                           password=password)
         return self.proxy_client.get_page(self.url)
 
     @defer.inlineCallbacks
@@ -262,9 +267,10 @@
         """Test failing accessing the url."""
         settings = self.get_auth_proxy_settings()
         # swap password for username to fail
-        d = self.failUnlessFailure(self.access_auth_url(settings['host'],
-                                        settings['port'], settings['password'],
-                                        settings['username']), error.Error)
+        d = self.failUnlessFailure(
+            self.access_auth_url(settings['host'],
+                                 settings['port'], settings['password'],
+                                 settings['username']), error.Error)
         return d
 
     def test_auth_url_407(self):
 
=== modified file 'ubuntuone/devtools/testcases/tests/test_txsocketserver.py'
--- ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-06-08 11:55:53 +0000
+++ ubuntuone/devtools/testcases/tests/test_txsocketserver.py	2012-11-29 21:41:22 +0000
@@ -139,9 +139,9 @@
             prot.factory._disconnecting = disconnecting
             prot.connectionLost()
             self.assertIn('connectionLost', self.called,
-                                        'Super connectionLost most be called')
+                          'Super connectionLost most be called')
             self.assertEqual(disconnecting,
-                           prot.factory.testserver_on_connection_lost.called)
+                             prot.factory.testserver_on_connection_lost.called)
 
     def test_connection_lost_disconnecting(self):
         """Test the connectionLost method."""
@@ -163,7 +163,7 @@
             prot.factory.testserver_on_connection_lost.callback(True)
             prot.connectionLost()
             self.assertIn('connectionLost', self.called,
-                                        'Super connectionLost must be called')
+                          'Super connectionLost must be called')
 # pylint: enable=E1102
 
 
@@ -187,7 +187,7 @@
         protocol_instance = protocol_cls()
         protocol_instance.connectionMade()
         self.assertIn('connectionMade', self.called,
-                                        'Super connectionMade must be called')
+                      'Super connectionMade must be called')
 
     # factory outside init
     def test_connection_made_called(self):
@@ -203,7 +203,7 @@
         protocol_instance.factory.testserver_on_connection_made.callback(True)
         protocol_instance.connectionMade()
         self.assertIn('connectionMade', self.called,
-                                        'Super connectionMade must be called')
+                      'Super connectionMade must be called')
 # pylint: enable=E1101
 
 
@@ -283,8 +283,8 @@
         calculator = yield self.client_factory.getRootObject()
         adder = yield calculator.callRemote('get_adder')
         self.setup_result = yield adder.callRemote('add',
-                                                    self.first_number,
-                                                    self.second_number)
+                                                   self.first_number,
+                                                   self.second_number)
 
     def test_deferreds(self):
         """Test that the deferreds are not broken."""
@@ -391,10 +391,10 @@
         first_number = 1
         second_number = 2
         yield self.first_tcp_server.listen_server(pb.PBServerFactory,
-                                                              self.calculator)
+                                                  self.calculator)
         self.addCleanup(self.first_tcp_server.clean_up)
         calculator_c = yield self.first_tcp_server.connect_client(
-                                                           pb.PBClientFactory)
+            pb.PBClientFactory)
         calculator = yield calculator_c.getRootObject()
         adder = yield calculator.callRemote('get_adder')
         result = yield adder.callRemote('add', first_number, second_number)
@@ -407,7 +407,7 @@
         second_number = 2
         # first server
         yield self.first_tcp_server.listen_server(pb.PBServerFactory,
-                                                              self.calculator)
+                                                  self.calculator)
         self.addCleanup(self.first_tcp_server.clean_up)
 
         # second server
@@ -417,9 +417,9 @@
 
         # connect the diff clients
         calculator_c = yield self.first_tcp_server.connect_client(
-                                                           pb.PBClientFactory)
+            pb.PBClientFactory)
         echoer_c = yield self.second_tcp_server.connect_client(
-                                                           pb.PBClientFactory)
+            pb.PBClientFactory)
 
         calculator = yield calculator_c.getRootObject()
         adder = yield calculator.callRemote('get_adder')
@@ -434,7 +434,7 @@
         """Test setting a single server no client."""
         # start server but do not connect a client
         yield self.first_tcp_server.listen_server(pb.PBServerFactory,
-                                                              self.calculator)
+                                                  self.calculator)
         self.addCleanup(self.first_tcp_server.clean_up)
 
     @defer.inlineCallbacks
@@ -442,7 +442,7 @@
         """Test setting multiple servers no clients."""
         # first server
         yield self.first_tcp_server.listen_server(pb.PBServerFactory,
-                                                              self.calculator)
+                                                  self.calculator)
         self.addCleanup(self.first_tcp_server.clean_up)
 
         # second server
 
=== modified file 'ubuntuone/devtools/testcases/txsocketserver.py'
--- ubuntuone/devtools/testcases/txsocketserver.py	2012-06-08 14:16:29 +0000
+++ ubuntuone/devtools/testcases/txsocketserver.py	2012-11-29 21:41:22 +0000
@@ -143,7 +143,7 @@
         self.server_factory = tidy_class(*args, **kwargs)
         self.server_factory._disconnecting = False
         self.server_factory.protocol = server_protocol_factory(
-                                                 self.server_factory.protocol)
+            self.server_factory.protocol)
         endpoint = endpoints.serverFromString(reactor,
                                               self.get_server_endpoint())
         self.listener = yield endpoint.listen(self.server_factory)
@@ -163,10 +163,10 @@
         self.client_factory = client_class(*args, **kwargs)
         self.client_factory._disconnecting = False
         self.client_factory.protocol = client_protocol_factory(
-                                                 self.client_factory.protocol)
+            self.client_factory.protocol)
         self.client_factory.testserver_on_connection_lost = defer.Deferred()
         endpoint = endpoints.clientFromString(reactor,
-                                                    self.get_client_endpoint())
+                                              self.get_client_endpoint())
         self.connector = yield endpoint.connect(self.client_factory)
         defer.returnValue(self.client_factory)
 
@@ -183,12 +183,14 @@
             d = defer.maybeDeferred(self.listener.stopListening)
             self.connector.transport.loseConnection()
             if self.server_factory.testserver_on_connection_lost:
-                return defer.gatherResults([d,
-                    self.client_factory.testserver_on_connection_lost,
-                    self.server_factory.testserver_on_connection_lost])
+                return defer.gatherResults(
+                    [d,
+                     self.client_factory.testserver_on_connection_lost,
+                     self.server_factory.testserver_on_connection_lost])
             else:
-                return defer.gatherResults([d,
-                    self.client_factory.testserver_on_connection_lost])
+                return defer.gatherResults(
+                    [d,
+                     self.client_factory.testserver_on_connection_lost])
         if self.listener:
             # just clean the server since there is no client
             # pylint: disable=W0201
@@ -213,7 +215,7 @@
             raise ValueError('Server Factory was not provided.')
         if self.listener is None:
             raise ValueError('%s has not started listening.',
-                                                          self.server_factory)
+                             self.server_factory)
         return self.client_endpoint_pattern % self.listener.getHost().port
 
 
@@ -279,9 +281,9 @@
         passed to the server constructor.
         """
         self.server_factory = yield self.server_runner.listen_server(
-                                                server_class, *args, **kwargs)
+            server_class, *args, **kwargs)
         self.server_disconnected = \
-                self.server_factory.testserver_on_connection_lost
+            self.server_factory.testserver_on_connection_lost
         self.listener = self.server_runner.listener
 
     @defer.inlineCallbacks
@@ -292,9 +294,9 @@
         should be passed to the client constructor.
         """
         self.client_factory = yield self.server_runner.connect_client(
-                                                client_class, *args, **kwargs)
+            client_class, *args, **kwargs)
         self.client_disconnected = \
-                self.client_factory.testserver_on_connection_lost
+            self.client_factory.testserver_on_connection_lost
         self.connector = self.server_runner.connector
 
     def tear_down_server_client(self):
@@ -330,13 +332,13 @@
     def listen_server(self, *args, **kwargs):
         """Listen a pb server."""
         yield super(PbServerTestCase, self).listen_server(pb.PBServerFactory,
-                                                              *args, **kwargs)
+                                                          *args, **kwargs)
 
     @defer.inlineCallbacks
     def connect_client(self, *args, **kwargs):
         """Connect a pb client."""
         yield super(PbServerTestCase, self).connect_client(pb.PBClientFactory,
-                                                              *args, **kwargs)
+                                                           *args, **kwargs)
 
 
 class TCPPbServerTestCase(PbServerTestCase):
 
=== modified file 'ubuntuone/devtools/testing/tests/test_txwebserver.py'
--- ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-08-28 20:28:43 +0000
+++ ubuntuone/devtools/testing/tests/test_txwebserver.py	2012-11-29 21:41:22 +0000
@@ -40,7 +40,7 @@
 SAMPLE_KEY = b"result"
 SAMPLE_VALUE = b"sample result"
 SAMPLE_RESOURCE = '{{"{0}": "{1}"}}'.format(
-                    SAMPLE_KEY, SAMPLE_VALUE).encode("utf8")
+    SAMPLE_KEY, SAMPLE_VALUE).encode("utf8")
 SIMPLERESOURCE = b"simpleresource"
 OTHER_SIMPLERESOURCE = b"othersimpleresource"
 THROWERROR = b"throwerror"
@@ -74,12 +74,13 @@
         root.putChild(THROWERROR, resource.NoResource())
 
         unauthorized_resource = resource.ErrorPage(resource.http.UNAUTHORIZED,
-                                                "Unauthorized", "Unauthorized")
+                                                   "Unauthorized",
+                                                   "Unauthorized")
         root.putChild(UNAUTHORIZED, unauthorized_resource)
         self.server = HTTPWebServer(root)
         self.server.start()
         self.uri = "http://127.0.0.1:{port}/".format(
-                        port=self.server.get_port()).encode("utf8")
+            port=self.server.get_port()).encode("utf8")
         self.addCleanup(self.server.stop)
 
     @defer.inlineCallbacks
@@ -130,7 +131,8 @@
         self.root.putChild(THROWERROR, resource.NoResource())
 
         unauthorized_resource = resource.ErrorPage(resource.http.UNAUTHORIZED,
-                                                "Unauthorized", "Unauthorized")
+                                                   "Unauthorized",
+                                                   "Unauthorized")
         self.root.putChild(UNAUTHORIZED, unauthorized_resource)
 
     def get_uri(self, server):
 
=== modified file 'ubuntuone/devtools/testing/txcheck.py'
--- ubuntuone/devtools/testing/txcheck.py	2012-08-20 22:39:50 +0000
+++ ubuntuone/devtools/testing/txcheck.py	2012-11-29 21:41:22 +0000
@@ -303,17 +303,17 @@
                 if not any_matches(decorators, INLINE_CALLBACKS_DECORATOR):
                     # ...but the inlineCallbacks decorator is missing
                     problem = MissingInlineCallbacks(
-                                  method=def_node.name,
-                                  test_class=class_to_check,
-                                  ancestor_class=ancestor_class)
+                        method=def_node.name,
+                        test_class=class_to_check,
+                        ancestor_class=ancestor_class)
                     problems.add(problem)
             else:
                 if not matches(def_node, match_descendant(RETURN_VALUE, DEFS)):
                     # The function fails to return a deferred
                     problem = MissingReturnValue(
-                                  method=def_node.name,
-                                  test_class=class_to_check,
-                                  ancestor_class=ancestor_class)
+                        method=def_node.name,
+                        test_class=class_to_check,
+                        ancestor_class=ancestor_class)
                     problems.add(problem)
 
     return problems
 
=== modified file 'ubuntuone/devtools/testing/txwebserver.py'
--- ubuntuone/devtools/testing/txwebserver.py	2012-08-21 21:36:20 +0000
+++ ubuntuone/devtools/testing/txwebserver.py	2012-11-29 21:41:22 +0000
@@ -68,7 +68,7 @@
     def get_iri(self):
         """Build the iri for this mock server."""
         return "{scheme}://127.0.0.1:{port}/".format(scheme=self.scheme,
-                                                   port=self.get_port())
+                                                     port=self.get_port())
 
     def get_port(self):
         """Return the port where we are listening."""
@@ -88,10 +88,11 @@
                     con.transport.loseConnection()
             else:
                 self.wrapper.testserver_on_connection_lost = \
-                                                            defer.succeed(None)
+                    defer.succeed(None)
             d = defer.maybeDeferred(self.port.stopListening)
-            return defer.gatherResults([d,
-                                  self.wrapper.testserver_on_connection_lost])
+            return defer.gatherResults(
+                [d,
+                 self.wrapper.testserver_on_connection_lost])
         return defer.succeed(None)
 
 
@@ -118,6 +119,6 @@
     def listen(self, site):
         """Listen a port to allow the tests."""
         ssl_context = ssl.DefaultOpenSSLContextFactory(
-                self.ssl_settings['key'], self.ssl_settings['cert'])
+            self.ssl_settings['key'], self.ssl_settings['cert'])
 
         return reactor.listenSSL(0, site, ssl_context)
 
=== modified file 'ubuntuone/devtools/tests/test_decorators.py'
--- ubuntuone/devtools/tests/test_decorators.py	2012-10-18 21:17:22 +0000
+++ ubuntuone/devtools/tests/test_decorators.py	2012-11-29 21:41:22 +0000
@@ -90,7 +90,7 @@
             self.assertEqual(len(result.skips), 1)
             self.assertEqual(result.successes, 1)
             self.assertEqual(result.skips,
-                [(test_do_skip, do_skip[1])])
+                             [(test_do_skip, do_skip[1])])
 
     def test_skip_class(self):
         """Test skipping a full test class."""
 
=== modified file 'ubuntuone/devtools/tests/test_txcheck.py'
--- ubuntuone/devtools/tests/test_txcheck.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/tests/test_txcheck.py	2012-11-29 21:41:22 +0000
@@ -110,7 +110,7 @@
         problems = find_problems(MissingReturnCase)
         self.assertEqual(problems, set([
             MissingReturnValue(method=m, test_class=MissingReturnCase,
-                                         ancestor_class=MissingReturnCase)
+                               ancestor_class=MissingReturnCase)
             for m in ('setUp', 'tearDown')]))
 
     def test_super_not_called(self):
@@ -130,7 +130,7 @@
         problems = find_problems(NoSuperCase)
         self.assertEqual(problems, set([
             SuperNotCalled(method=m, test_class=NoSuperCase,
-                                     ancestor_class=NoSuperCase)
+                           ancestor_class=NoSuperCase)
             for m in ('setUp', 'tearDown')]))
 
     def test_bare_super(self):
@@ -152,7 +152,7 @@
         problems = find_problems(BareSuperCase)
         self.assertEqual(problems, set([
             SuperResultDiscarded(method=m, test_class=BareSuperCase,
-                                           ancestor_class=BareSuperCase)
+                                 ancestor_class=BareSuperCase)
             for m in ('setUp', 'tearDown')]))
 
     def test_inline_callbacks_missing(self):