Merge lp:~elachuni/piston-mini-client/fix-tests into lp:piston-mini-client

[Anthony Lenton]

Made tests pass with the latest pep8 release.

This branch fixes the tests that were failing in trunk:
 - The latest pep8 release changes the internal layout of the module, so the test that uses it needed to apply matching changes.
 - oauth is still broken on Python 3 (it attempts to import urlparse, for starters), so the OAuth test is skipped on Python 3.

[Jonathan Lange (jml)]

Looks good to me. Thanks.

review: Approve

=== modified file 'piston_mini_client/__init__.py'
--- piston_mini_client/__init__.py	2012-07-30 15:59:14 +0000
+++ piston_mini_client/__init__.py	2012-07-30 17:16:48 +0000
@@ -212,8 +212,8 @@
         data = {}
         for att in self._atts:
             if not hasattr(self, att):
-                raise ValueError("Attempted to serialize attribute '%s'"
-                    % att)
+                raise ValueError(
+                    "Attempted to serialize attribute '%s'" % att)
             data[att] = getattr(self, att)
         return data
 
@@ -333,8 +333,8 @@
     def _get_http_obj_for_scheme(self, scheme):
         proxy_info = self._get_proxy_info(scheme)
         http = None
-        if (self._disable_ssl_validation or
-            os.environ.get(DISABLE_SSL_VALIDATION_ENVVAR)):
+        check_disabled_in_env = os.environ.get(DISABLE_SSL_VALIDATION_ENVVAR)
+        if self._disable_ssl_validation or check_disabled_in_env:
             try:
                 http = httplib2.Http(
                     cache=self._httplib2_cache,
@@ -346,7 +346,7 @@
                 pass
         if http is None:
             http = httplib2.Http(cache=self._httplib2_cache,
-                timeout=self._timeout, proxy_info=proxy_info)
+                                 timeout=self._timeout, proxy_info=proxy_info)
         return http
 
     def _get_proxy_info(self, scheme):
@@ -396,10 +396,10 @@
             path += urlencode(args)
         headers = self._prepare_headers(extra_headers=extra_headers)
         return self._request(path, method='GET', scheme=scheme,
-            headers=headers)
+                             headers=headers)
 
     def _post(self, path, data=None, content_type=None, scheme=None,
-        extra_headers=None):
+              extra_headers=None):
         """Perform an HTTP POST request.
 
         The provided ``path`` is appended to this api's ``_service_root``
@@ -424,12 +424,12 @@
         will be added to the http request.
         """
         body, headers = self._prepare_request(data, content_type,
-            extra_headers=extra_headers)
+                                              extra_headers=extra_headers)
         return self._request(path, method='POST', body=body,
-            headers=headers, scheme=scheme)
+                             headers=headers, scheme=scheme)
 
     def _put(self, path, data=None, content_type=None, scheme=None,
-        extra_headers=None):
+             extra_headers=None):
         """Perform an HTTP PUT request.
 
         The provided ``path`` is appended to this api's ``_service_root``
@@ -454,9 +454,9 @@
         will be added to the http request.
         """
         body, headers = self._prepare_request(data, content_type,
-            extra_headers=extra_headers)
+                                              extra_headers=extra_headers)
         return self._request(path, method='PUT', body=body,
-            headers=headers, scheme=scheme)
+                             headers=headers, scheme=scheme)
 
     def _delete(self, path, scheme=None, extra_headers=None):
         """Perform an HTTP DELETE request.
@@ -473,10 +473,10 @@
         """
         headers = self._prepare_headers(extra_headers=extra_headers)
         return self._request(path, method='DELETE', scheme=scheme,
-            headers=headers)
+                             headers=headers)
 
     def _prepare_request(self, data=None, content_type=None,
-        extra_headers=None):
+                         extra_headers=None):
         """Put together a set of headers and a body for a request.
 
         If ``content_type`` is not provided, ``self.default_content_type``
@@ -550,8 +550,8 @@
         if self.log_filename:
             self._dump_request(url, method, body, headers)
         try:
-            response, response_body = self._http[scheme].request(url,
-                method=method, body=body, headers=headers)
+            response, response_body = self._http[scheme].request(
+                url, method=method, body=body, headers=headers)
         except AttributeError as e:
             # Special case out httplib2's way of telling us unable to connect
             if e.args[0] == "'NoneType' object has no attribute 'makefile'":
@@ -560,10 +560,10 @@
                 raise
         except socket.timeout as e:
             raise TimeoutError('Timed out attempting to connect to %s' %
-                self._service_root)
+                               self._service_root)
         except (socket.gaierror, socket.error) as e:
-            raise SocketError('connecting to %s: %s' % (self._service_root,
-                e.message))
+            msg = 'connecting to %s: %s' % (self._service_root, e.message)
+            raise SocketError(msg)
         if self.log_filename:
             self._dump_response(response, response_body)
         handler = self.fail_handler(url, method, body, headers)
@@ -573,16 +573,16 @@
     def _dump_request(self, url, method, body, headers):
         try:
             with open(self.log_filename, 'a') as f:
-                f.write("{0}: {1}".format(datetime.now(),
-                    format_request(url, method, body, headers)))
+                formatted = format_request(url, method, body, headers)
+                f.write("{0}: {1}".format(datetime.now(), formatted))
         except IOError:
             pass
 
     def _dump_response(self, response, body):
         try:
             with open(self.log_filename, 'a') as f:
-                f.write("{0}: {1}".format(datetime.now(),
-                    format_response(response, body)))
+                formatted = format_response(response, body)
+                f.write("{0}: {1}".format(datetime.now(), formatted))
         except IOError:
             pass
 
@@ -595,7 +595,8 @@
             cached_value = self._http[scheme].cache.get(
                 httplib2.urlnorm(url)[-1])
             if cached_value:
-                info, content = cached_value.decode("utf-8").split('\r\n\r\n', 1)
+                info, content = cached_value.decode("utf-8").split(
+                    '\r\n\r\n', 1)
                 return content
 
     def _path2url(self, path, scheme=None):
 
=== modified file 'piston_mini_client/auth.py'
--- piston_mini_client/auth.py	2012-06-14 08:19:19 +0000
+++ piston_mini_client/auth.py	2012-07-30 17:16:48 +0000
@@ -12,6 +12,7 @@
 
 import base64
 
+
 class OAuthAuthorizer(object):
     """Authenticate to OAuth protected APIs."""
     def __init__(self, token_key, token_secret, consumer_key, consumer_secret,
@@ -33,13 +34,13 @@
         # Import oauth here so that you don't need it if you're not going
         # to use it.  Plan B: move this out into a separate oauth module.
         from oauth.oauth import (OAuthRequest, OAuthConsumer, OAuthToken,
-            OAuthSignatureMethod_PLAINTEXT)
+                                 OAuthSignatureMethod_PLAINTEXT)
         consumer = OAuthConsumer(self.consumer_key, self.consumer_secret)
         token = OAuthToken(self.token_key, self.token_secret)
         oauth_request = OAuthRequest.from_consumer_and_token(
             consumer, token, http_url=url)
         oauth_request.sign_request(OAuthSignatureMethod_PLAINTEXT(),
-            consumer, token)
+                                   consumer, token)
         headers.update(oauth_request.to_header(self.oauth_realm))
 
 
 
=== modified file 'piston_mini_client/failhandlers.py'
--- piston_mini_client/failhandlers.py	2012-07-19 15:38:19 +0000
+++ piston_mini_client/failhandlers.py	2012-07-30 17:16:48 +0000
@@ -113,7 +113,7 @@
             raise APIError('No status code in response')
         if self.was_error(response):
             raise APIError('%s: %s' % (response['status'], response), body,
-                data=self.data)
+                           data=self.data)
         return body
 
 
@@ -197,5 +197,5 @@
             status = response.get('status')
             exception_class = self.exceptions.get(status, APIError)
             raise exception_class('%s: %s' % (status, response), body,
-                data=self.data)
+                                  data=self.data)
         return body
 
=== modified file 'piston_mini_client/tests/test_auth.py'
--- piston_mini_client/tests/test_auth.py	2012-06-14 08:19:19 +0000
+++ piston_mini_client/tests/test_auth.py	2012-07-30 17:16:48 +0000
@@ -2,6 +2,7 @@
 # Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Lesser General Public License version 3 (see the file LICENSE).
 
+import sys
 from piston_mini_client.auth import OAuthAuthorizer, BasicAuthorizer
 from unittest import TestCase
 
@@ -19,6 +20,10 @@
 
 class OAuthAuthorizerTestCase(TestCase):
     def test_sign_request(self):
+        if sys.version_info[0] == 3:
+            # Skip on Python 3 as oauth is still broken there.
+            # don't use skipIf as it's missing on python2.6
+            return
         auth = OAuthAuthorizer('tkey', 'tsecret', 'ckey', 'csecret')
         url = 'http://example.com/api'
         headers = {}
 
=== modified file 'piston_mini_client/tests/test_disable_ssl_check.py'
--- piston_mini_client/tests/test_disable_ssl_check.py	2012-03-30 17:17:49 +0000
+++ piston_mini_client/tests/test_disable_ssl_check.py	2012-07-30 17:16:48 +0000
@@ -35,14 +35,14 @@
         api = DentistAPI()
 
         self.assertTrue('disable_ssl_certificate_validation' not in
-            mock_http.call_args[1])
+                        mock_http.call_args[1])
 
     @patch('httplib2.Http')
     def test_disable_via_constructor(self, mock_http):
         api = DentistAPI(disable_ssl_validation=True)
 
         self.assertTrue('disable_ssl_certificate_validation' in
-            mock_http.call_args[1])
+                        mock_http.call_args[1])
 
     @patch('httplib2.Http')
     def test_disable_via_envvar(self, mock_http):
@@ -50,4 +50,4 @@
         api = DentistAPI()
 
         self.assertTrue('disable_ssl_certificate_validation' in
-            mock_http.call_args[1])
+                        mock_http.call_args[1])
 
=== modified file 'piston_mini_client/tests/test_failhandlers.py'
--- piston_mini_client/tests/test_failhandlers.py	2012-07-19 15:56:33 +0000
+++ piston_mini_client/tests/test_failhandlers.py	2012-07-30 17:16:48 +0000
@@ -120,7 +120,7 @@
         handler = ExceptionFailHandler('/foo', 'GET', '', {})
         for status in bad_status:
             self.assertRaises(APIError, handler.handle,
-                {'status': status}, '')
+                              {'status': status}, '')
 
 
 class NoneFailHandlerTestCase(TestCase):
@@ -253,7 +253,7 @@
         mock_request.return_value = {'status': '200'}, '{"foo": "bar"}'
 
         self.assertTrue(isinstance(self.api.get_plant(),
-            PistonResponseObject))
+                        PistonResponseObject))
 
     @patch('httplib2.Http.request')
     def test_interacts_well_with_returns_list_of(self, mock_request):
@@ -285,7 +285,7 @@
         handler = MultiExceptionFailHandler('/foo', 'GET', '', {})
         for status, exception in bad_status.items():
             self.assertRaises(exception, handler.handle, {'status': status},
-                '')
+                              '')
 
     @patch('httplib2.Http.request')
     def test_interacts_well_with_returns_json_on_fail(self, mock_request):
@@ -324,7 +324,7 @@
         mock_request.return_value = {'status': '200'}, '{"foo": "bar"}'
 
         self.assertTrue(isinstance(self.api.get_plant(),
-            PistonResponseObject))
+                        PistonResponseObject))
 
     @patch('httplib2.Http.request')
     def test_interacts_well_with_returns_list_of(self, mock_request):
 
=== modified file 'piston_mini_client/tests/test_log_to_file.py'
--- piston_mini_client/tests/test_log_to_file.py	2012-06-14 08:10:28 +0000
+++ piston_mini_client/tests/test_log_to_file.py	2012-07-30 17:16:48 +0000
@@ -19,14 +19,14 @@
     @returns_json
     def poke(self, data=None):
         return self._post('/poke/', data=data,
-            extra_headers={'location': 'ribs'})
+                          extra_headers={'location': 'ribs'})
 
 
 class LogToFileTestCase(TestCase):
     @patch('httplib2.Http.request')
     def test_requests_are_dumped_to_file(self, mock_request):
         mock_request.return_value = ({'status': '201', 'x-foo': 'bar'},
-            '"Go away!"')
+                                     '"Go away!"')
 
         with NamedTemporaryFile() as fp:
             api = AnnoyAPI(log_filename=fp.name)
@@ -41,7 +41,7 @@
         self.assertTrue(lines[0].endswith(
             'Request: POST http://test.info/api/1.0/poke/'))
         self.assertEqual(['Content-type: application/json',
-            'location: ribs', '', '[1, 2, 3]'], lines[1:5])
+                         'location: ribs', '', '[1, 2, 3]'], lines[1:5])
         self.assertTrue(lines[5].endswith('Response: 201'))
         self.assertEqual(['x-foo: bar', '', '"Go away!"', ''], lines[6:])
 
 
=== modified file 'piston_mini_client/tests/test_pep8.py'
--- piston_mini_client/tests/test_pep8.py	2012-03-30 17:17:49 +0000
+++ piston_mini_client/tests/test_pep8.py	2012-07-30 17:16:48 +0000
@@ -15,36 +15,29 @@
     packages = [piston_mini_client]
     exclude = ['socks.py']  # Leave 3rd party dep. alone.
 
-    def message(self, text):
-        self.errors.append(text)
-
-    def setUp(self):
-        self.errors = []
-
-        class Options(object):
-            exclude = self.exclude
-            filename = ['*.py']
-            testsuite = ''
-            doctest = ''
-            counters = defaultdict(int)
-            messages = {}
-            verbose = 0
-            quiet = 0
-            repeat = True
-            show_source = False
-            show_pep8 = False
-            select = []
-            ignore = []
-            max_line_length = 79
-        pep8.options = Options()
-        pep8.message = self.message
-        Options.physical_checks = pep8.find_checks('physical_line')
-        Options.logical_checks = pep8.find_checks('logical_line')
-
     def test_all_code(self):
+        pep8style = pep8.StyleGuide(
+            counters=defaultdict(int),
+            doctest='',
+            exclude=self.exclude,
+            filename=['*.py'],
+            ignore=[],
+            messages={},
+            repeat=True,
+            select=[],
+            show_pep8=False,
+            show_source=False,
+            max_line_length=79,
+            quiet=0,
+            statistics=False,
+            testsuite='',
+            verbose=0,
+        )
+
         for package in self.packages:
-            pep8.input_dir(os.path.dirname(package.__file__))
-        self.assertEqual([], self.errors)
+            pep8style.input_dir(os.path.dirname(package.__file__))
+        self.assertEqual(pep8style.options.report.total_errors, 0)
+
 
 if __name__ == "__main__":
     unittest.main()
 
=== modified file 'piston_mini_client/tests/test_resource.py'
--- piston_mini_client/tests/test_resource.py	2012-07-30 15:59:14 +0000
+++ piston_mini_client/tests/test_resource.py	2012-07-30 17:16:48 +0000
@@ -27,11 +27,11 @@
 
     @patch('httplib2.Http.request')
     def test_request(self, mock_request):
-        mock_request.return_value = ({'status': '200'
-        }, 'hello world!')
+        mock_request.return_value = ({'status': '200'}, 'hello world!')
         api = self.CoffeeAPI()
         api._request('/foo', 'POST', body='foo=bar')
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='foo=bar', headers={}, method='POST')
 
     @patch('httplib2.Http.request')
@@ -68,7 +68,8 @@
         cache = httplib2.FileCache(tmpdir, safe=safename)
         http = httplib2.Http(cache=cache)
         cachekey = self.CoffeeAPI.default_service_root + path
-        http.cache.set(cachekey.encode('utf-8'),
+        http.cache.set(
+            cachekey.encode('utf-8'),
             "header\r\n\r\nmy_cached_body_from_long_path\n".encode('utf-8'))
         # ensure that we trigger a error like when offline (no dns)
         mock_request.side_effect = httplib2.ServerNotFoundError("")
@@ -83,11 +84,11 @@
     def test_auth_request(self, mock_request):
         mock_request.return_value = ({'status': '200'}, '""')
         api = self.CoffeeAPI(auth=BasicAuthorizer(username='foo',
-            password='bar'))
+                             password='bar'))
         api._request('/fee', 'GET')
         kwargs = mock_request.call_args[1]
         self.assertEqual(kwargs['headers']['Authorization'],
-            'Basic Zm9vOmJhcg==')
+                         'Basic Zm9vOmJhcg==')
         self.assertEqual(kwargs['method'], 'GET')
 
     @patch('httplib2.Http.request')
@@ -116,10 +117,10 @@
         mock_request.return_value = ({'status': '200'}, '""')
         api = self.CoffeeAPI()
         api._post('/serve', data={'foo': 'bar'},
-            content_type='application/x-www-form-urlencoded')
+                  content_type='application/x-www-form-urlencoded')
         kwargs = mock_request.call_args[1]
         self.assertEqual(kwargs['headers']['Content-type'],
-            'application/x-www-form-urlencoded')
+                         'application/x-www-form-urlencoded')
         self.assertEqual(kwargs['method'], 'POST')
 
     @patch('httplib2.Http.request')
@@ -150,7 +151,7 @@
             body = api._get('/simmer')
             self.assertEqual(expected_body, body)
             mock_request.assert_called_with('http://localhost:12345/simmer',
-                body='', headers={}, method='GET')
+                                            body='', headers={}, method='GET')
 
     @patch('httplib2.Http.request')
     def test_get_with_extra_args(self, mock_request):
@@ -187,7 +188,7 @@
         api = self.CoffeeAPI()
         api._request('/foo', 'GET', scheme='https')
         mock_request.assert_called_with('https://localhost:12345/foo',
-            body='', headers={}, method='GET')
+                                        body='', headers={}, method='GET')
 
     @patch('httplib2.Http.request')
     def test_get_scheme_switch_to_https(self, mock_request):
@@ -195,14 +196,15 @@
         api = self.CoffeeAPI()
         api._get('/foo', scheme='https')
         mock_request.assert_called_with('https://localhost:12345/foo',
-            body='', headers={}, method='GET')
+                                        body='', headers={}, method='GET')
 
     @patch('httplib2.Http.request')
     def test_post_scheme_switch_to_https(self, mock_request):
         mock_request.return_value = ({'status': '200'}, '""')
         api = self.CoffeeAPI()
         api._post('/foo', scheme='https')
-        mock_request.assert_called_with('https://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'https://localhost:12345/foo',
             body='null', headers={'Content-type': 'application/json'},
             method='POST')
 
@@ -250,7 +252,8 @@
         mock_request.return_value = ({'status': '200'}, '""')
         api = self.CoffeeAPI()
         api._put('/foo', scheme='https')
-        mock_request.assert_called_with('https://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'https://localhost:12345/foo',
             body='null', headers={'Content-type': 'application/json'},
             method='PUT')
 
@@ -259,11 +262,11 @@
         mock_request.return_value = ({'status': '200'}, '""')
         api = self.CoffeeAPI()
         api._put('/serve', data={'foo': 'bar'},
-            content_type='application/x-www-form-urlencoded')
+                 content_type='application/x-www-form-urlencoded')
         kwargs = mock_request.call_args[1]
         self.assertEqual(kwargs['body'], 'foo=bar')
         self.assertEqual(kwargs['headers']['Content-type'],
-            'application/x-www-form-urlencoded')
+                         'application/x-www-form-urlencoded')
         self.assertEqual(kwargs['method'], 'PUT')
 
     @patch('httplib2.Http.request')
@@ -273,17 +276,21 @@
         api.extra_headers = {'X-Foo': 'bar'}
         api._get('/foo')
         expected_headers = {'X-Foo': 'bar'}
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='', headers=expected_headers, method='GET')
         api._delete('/foo')
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='', headers=expected_headers, method='DELETE')
         expected_headers['Content-type'] = 'application/json'
         api._post('/foo')
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='null', headers=expected_headers, method='POST')
         api._put('/foo')
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='null', headers=expected_headers, method='PUT')
 
     @patch('httplib2.Http.request')
@@ -292,17 +299,21 @@
         api = self.CoffeeAPI()
         api._get('/foo', extra_headers={'X-Foo': 'bar'})
         expected_headers = {'X-Foo': 'bar'}
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='', headers=expected_headers, method='GET')
         api._delete('/foo', extra_headers={'X-Foo': 'bar'})
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='', headers=expected_headers, method='DELETE')
         expected_headers['Content-type'] = 'application/json'
         api._post('/foo', extra_headers={'X-Foo': 'bar'})
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='null', headers=expected_headers, method='POST')
         api._put('/foo', extra_headers={'X-Foo': 'bar'})
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body='null', headers=expected_headers, method='PUT')
 
     @patch('httplib2.Http.request')
@@ -317,12 +328,14 @@
         api = self.CoffeeAPI()
         api.serializers = {'application/json': MySerializer()}
         api._post('/foo', data=[])
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body=expected, headers={'Content-type': 'application/json'},
             method='POST')
 
         api._put('/foo', data=None)
-        mock_request.assert_called_with('http://localhost:12345/foo',
+        mock_request.assert_called_with(
+            'http://localhost:12345/foo',
             body=expected, headers={'Content-type': 'application/json'},
             method='PUT')
 
@@ -341,7 +354,7 @@
         api = self.CoffeeAPI()
         api._delete('/sugar/12', scheme='https')
         mock_request.assert_called_with('https://localhost:12345/sugar/12',
-            body='', headers={}, method='DELETE')
+                                        body='', headers={}, method='DELETE')
 
     def test_cachedir_crash_race_lp803280(self):
         def _simulate_race(path):
 
=== modified file 'piston_mini_client/tests/test_serializers.py'
--- piston_mini_client/tests/test_serializers.py	2012-03-30 17:17:49 +0000
+++ piston_mini_client/tests/test_serializers.py	2012-07-30 17:16:48 +0000
@@ -44,4 +44,4 @@
         # Maybe we should flatly refuse to serialize nested structures?
         serializer = FormSerializer()
         self.assertEqual('foo=%7B%27a%27%3A+%27b%27%7D',
-            serializer.serialize({'foo': {'a': 'b'}}))
+                         serializer.serialize({'foo': {'a': 'b'}}))
 
=== modified file 'piston_mini_client/tests/test_timeout.py'
--- piston_mini_client/tests/test_timeout.py	2012-04-02 14:23:33 +0000
+++ piston_mini_client/tests/test_timeout.py	2012-07-30 17:16:48 +0000
@@ -25,7 +25,7 @@
         api = LazyAPI(timeout=1)
         self.assertEqual(1, api._timeout)
         mock_http.assert_called_with(cache=None, proxy_info=None, timeout=1,
-            disable_ssl_certificate_validation=True)
+                                     disable_ssl_certificate_validation=True)
 
     @patch('os.environ.get')
     @patch('httplib2.Http')
@@ -34,7 +34,7 @@
         api = LazyAPI()
         self.assertEqual(3.14, api._timeout)
         mock_http.assert_called_with(cache=None, proxy_info=None, timeout=3.14,
-            disable_ssl_certificate_validation=True)
+                                     disable_ssl_certificate_validation=True)
 
     @patch('os.environ.get')
     @patch('httplib2.Http')
@@ -47,7 +47,7 @@
     @patch('os.environ.get')
     @patch('httplib2.Http')
     def test_no_nothing_falls_back_to_system_default(self, mock_http,
-        mock_get):
+                                                     mock_get):
         class DefaultAPI(PistonAPI):
             default_service_root = 'http://test.info/api/1.0/'
 
@@ -63,7 +63,7 @@
         api = LazyAPI()
         self.assertEqual(42, api._timeout)
         mock_http.assert_called_with(cache=None, proxy_info=None, timeout=42,
-            disable_ssl_certificate_validation=True)
+                                     disable_ssl_certificate_validation=True)
 
     @patch('httplib2.HTTPConnectionWithTimeout.connect')
     def test_timeout_is_handled_by_failhandler(self, mock_connect):
 
=== modified file 'piston_mini_client/tests/test_validators.py'
--- piston_mini_client/tests/test_validators.py	2012-03-30 17:17:49 +0000
+++ piston_mini_client/tests/test_validators.py	2012-07-30 17:16:48 +0000
@@ -2,8 +2,14 @@
 # Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Lesser General Public License version 3 (see the file LICENSE).
 
-from piston_mini_client.validators import (validate_pattern, validate,
-    validate_integer, oauth_protected, basic_protected, ValidationException)
+from piston_mini_client.validators import (
+    basic_protected,
+    oauth_protected,
+    validate,
+    validate_integer,
+    validate_pattern,
+    ValidationException,
+)
 from piston_mini_client.auth import OAuthAuthorizer, BasicAuthorizer
 from unittest import TestCase
 
 
=== modified file 'piston_mini_client/validators.py'
--- piston_mini_client/validators.py	2012-06-13 13:25:54 +0000
+++ piston_mini_client/validators.py	2012-07-30 17:16:48 +0000
@@ -42,7 +42,7 @@
                 if not re.match(pattern, kwargs[varname]):
                     raise ValidationException(
                         "Argument '%s' must match pattern '%s'" % (varname,
-                            pattern))
+                        pattern))
             elif required:
                 raise ValidationException(
                     "Required named argument '%s' missing" % varname)
@@ -111,7 +111,8 @@
     @wraps(func)
     def wrapper(self, *args, **kwargs):
         if not hasattr(self, '_auth') or self._auth is None:
-            raise ValidationException("This method is OAuth protected.  "
+            raise ValidationException(
+                "This method is OAuth protected.  "
                 "Pass in an 'auth' argument to the constructor.")
         if not isinstance(self._auth, OAuthAuthorizer):
             raise ValidationException("self.auth must be an OAuthAuthorizer.")
@@ -128,7 +129,8 @@
     @wraps(func)
     def wrapper(self, *args, **kwargs):
         if not hasattr(self, '_auth') or self._auth is None:
-            raise ValidationException("This method uses Basic auth.  "
+            raise ValidationException(
+                "This method uses Basic auth.  "
                 "Pass in an 'auth' argument to the constructor.")
         if not isinstance(self._auth, BasicAuthorizer):
             raise ValidationException("self.auth must be a BasicAuthorizer.")