Fix formatting

Author: amcmahon-rh

fastpurge/_client.py

@@ -26,7 +26,6 @@
 
 LOG = logging.getLogger('fastpurge')
 
-
 Purge = namedtuple('Purge', [
     # Response from Akamai when this purge was created
     'response_body',
@@ -48,16 +47,17 @@ def new(self, **kw):
     def increment(self, method, url, *args, **kwargs):
         response = kwargs.get("response")
         if response:
-            self._logger.error("An invalid status code %s was received "
-                               "when trying to %s to %s: %s"
-                           % (response.status, method, url, response.reason))
+            self._logger.error(
+                "An invalid status code %s was received when trying to %s to %s: %s" % (
+                response.status, method, url, response.reason))
         else:
             self._logger.error(
                 "An unknown error occurred when trying to %s to %s"
                 % (method, url))
         return super(LoggingRetry, self).increment(method, url, *args,
                                                    **kwargs)
 
+
 class FastPurgeError(RuntimeError):
     """Raised when the Fast Purge API reports an error.
 
@@ -98,7 +98,8 @@ class FastPurgeClient(object):
     MAX_REQUESTS = int(os.environ.get("FAST_PURGE_MAX_REQUESTS", "10"))
 
     # Default network matches Akamai's documented default
-    DEFAULT_NETWORK = os.environ.get("FAST_PURGE_DEFAULT_NETWORK", "production")
+    DEFAULT_NETWORK = os.environ.get("FAST_PURGE_DEFAULT_NETWORK",
+                                     "production")
 
     # Max number of retries allowed for HTTP requests, and the backoff used
     # to extend the delay between requests.
@@ -168,11 +169,11 @@ def __executor(self):
         if self.___executor is None:
             with self.__lock:
                 if self.___executor is None:
-                    self.___executor = Executors.\
-                        sync(name="fastpurge").\
-                        with_poll(self.__poll_purges).\
-                        with_throttle(count=self.MAX_REQUESTS).\
-                        with_retry().\
+                    self.___executor = Executors. \
+                        sync(name="fastpurge"). \
+                        with_poll(self.__poll_purges). \
+                        with_throttle(count=self.MAX_REQUESTS). \
+                        with_retry(). \
                         with_cancel_on_shutdown()
         return self.___executor
 
@@ -189,7 +190,8 @@ def __poll_purges(cls, descriptors):
         earliest = now + cls.DEFAULT_DELAY
 
         for descriptor in descriptors:
-            purge_id = descriptor.result.response_body.get('purgeId', '<unknown purge>')
+            purge_id = descriptor.result.response_body.get('purgeId',
+                                                           '<unknown purge>')
             when_complete = descriptor.result.estimated_complete
             earliest = min(earliest, when_complete)
             if when_complete > now:
@@ -212,7 +214,8 @@ def __poll_purges(cls, descriptors):
             # here.
             descriptor.yield_result(descriptor.result.response_body)
 
-        LOG.debug("now %s, earliest %s, sleep %s", now, earliest, earliest - now)
+        LOG.debug("now %s, earliest %s, sleep %s", now, earliest,
+                  earliest - now)
         return min(earliest - now, cls.DEFAULT_DELAY)
 
     @property
@@ -267,25 +270,27 @@ def __get_request_bodies(self, objects):
 
         # Too big for a single request.
         # Split it in half and try again
-        part = int(len(objects)/2)
+        part = int(len(objects) / 2)
         objects_a, objects_b = objects[:part], objects[part:]
-        return self.__get_request_bodies(objects_a) + self.__get_request_bodies(objects_b)
+        return self.__get_request_bodies(
+            objects_a) + self.__get_request_bodies(objects_b)
 
     def __start_purge(self, endpoint, request_body):
         headers = {'Content-Type': 'application/json'}
         LOG.debug("POST JSON of size %s to %s", len(request_body), endpoint)
         try:
-            response = self.__session.post(endpoint, data=request_body, headers=headers)
+            response = self.__session.post(endpoint, data=request_body,
+                                           headers=headers)
             response_body = response.json()
             estimated_seconds = response_body.get('estimatedSeconds', 5)
             return Purge(response_body, monotonic() + estimated_seconds)
         except RetryError as e:
             message = "Request to {endpoint} was unsuccessful after {retries} retries: {reason}". \
-                format(endpoint=endpoint, retries=self.MAX_RETRIES, reason=e.args[0].reason)
+                format(endpoint=endpoint, retries=self.MAX_RETRIES,
+                       reason=e.args[0].reason)
             LOG.debug(message)
             raise FastPurgeError(message)
 
-
     def purge_objects(self, object_type, objects, **kwargs):
         """Purge a collection of objects.
 
@@ -348,7 +353,8 @@ def purge_objects(self, object_type, objects, **kwargs):
 
         futures = []
         for request_body in request_bodies:
-            future = self.__executor.submit(self.__start_purge, endpoint, request_body)
+            future = self.__executor.submit(self.__start_purge, endpoint,
+                                            request_body)
             futures.append(future)
 
         return f_sequence(futures)

tests/test_purge.py

@@ -11,6 +11,7 @@
 
 from fastpurge import FastPurgeClient, FastPurgeError
 
+
 # pylint: disable=unused-argument
 
 
@@ -42,7 +43,8 @@ def requests_mocker():
 def no_thread_retries():
     """Suppress retries for the duration of this fixture."""
 
-    with mock.patch('more_executors.retry.ExceptionRetryPolicy') as policy_class:
+    with mock.patch(
+            'more_executors.retry.ExceptionRetryPolicy') as policy_class:
         policy = policy_class.return_value
         policy.should_retry.return_value = False
         policy.sleep_time.return_value = 0.1
@@ -105,7 +107,8 @@ def test_purge_by_tag(client, requests_mocker):
         status_code=201,
         json=response)
 
-    future = client.purge_by_tag(["red", "blue", "green"], purge_type='invalidate')
+    future = client.purge_by_tag(["red", "blue", "green"],
+                                 purge_type='invalidate')
 
     # It should have succeeded
     assert future.result()
@@ -134,7 +137,7 @@ def test_scheme_port(client_auth, requests_mocker):
 
 
 @responses.activate
-def test_response_fails(client,  no_thread_retries):
+def test_response_fails(client, no_thread_retries):
     """Requests fail with a FastPurgeError if API gives unsuccessful response."""
     url = 'https://fastpurge.example.com/ccu/v3/delete/cpcode/production'
     # Decrease backoff, otherwise the test will run for 5 minutes
@@ -203,6 +206,7 @@ def test_multiple_clients_with_the_same_auth_dict(client_auth):
 
     assert client1 is not client2
 
+
 @responses.activate(registry=responses.registries.OrderedRegistry)
 def test_retries_on_error(client_auth):
     """Sanity check for the retry functionality"""