finished making everything a consistent style (PEP 8 compliant)

Author: callum-oakley

pusher/__init__.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from .pusher import Pusher
+from pusher.pusher import Pusher
 
-__all__ = [
-    'Pusher',
-]
+__all__ = ['Pusher']

pusher/aiohttp.py

@@ -5,6 +5,7 @@
 
 from pusher.http import process_response
 
+
 class AsyncIOBackend:
     def __init__(self, client):
         """Adapter for the requests module.
@@ -14,6 +15,7 @@ def __init__(self, client):
         self.client = client
         self.conn = aiohttp.TCPConnector()
 
+
     def send_request(self, request):
         method = request.method
         url = "%s%s" % (request.base_url, request.path)
@@ -22,8 +24,10 @@ def send_request(self, request):
         headers = request.headers
 
         response = yield from asyncio.wait_for(
-            aiohttp.request(method, url, params=params, data=data, headers=headers, connector=self.conn),
-            timeout=self.client.timeout
-        )
+            aiohttp.request(
+                method, url, params=params, data=data, headers=headers,
+                connector=self.conn),
+            timeout=self.client.timeout)
+
         body = yield from response.read_and_close()
         return process_response(response.status, body.decode('utf8'))

pusher/client.py

@@ -10,6 +10,7 @@
 
 import six
 
+
 class Client(object):
     def __init__(
             self, app_id, key, secret, ssl=True, host=None, port=None,

pusher/errors.py

@@ -3,14 +3,18 @@
 class PusherError(Exception):
     pass
 
+
 class PusherBadRequest(PusherError):
     pass
 
+
 class PusherBadAuth(PusherError):
     pass
 
+
 class PusherForbidden(PusherError):
     pass
 
+
 class PusherBadStatus(PusherError):
-    pass
+    pass

pusher/gae.py

@@ -1,26 +1,32 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (print_function, unicode_literals, absolute_import,
-                        division)
+from __future__ import (
+    print_function,
+    unicode_literals,
+    absolute_import,
+    division)
 
 from google.appengine.api import urlfetch
 from pusher.http import process_response
 
+
 class GAEBackend(object):
-  """Adapter for the URLFetch Module. Necessary for using this library with Google
-  App Engine"""
+    """
+    Adapter for the URLFetch Module. Necessary for using this library with
+    Google App Engine
+    """
+    def __init__(self, client, **options):
+        self.client = client
+        self.options = options
+
+
+    def send_request(self, request):
+        resp = urlfetch.fetch(
+            url=request.url,
+            headers=request.headers,
+            method=request.method,
+            payload=request.body,
+            deadline=self.client.timeout,
+            **self.options)
 
-  def __init__(self, client, **options):
-    self.client = client
-    self.options = options
-  
-  def send_request(self, request):
-    resp = urlfetch.fetch(
-      url=request.url,
-      headers=request.headers,
-      method=request.method,
-      payload=request.body,
-      deadline=self.client.timeout,
-      **self.options
-    )
-    return process_response(resp.status_code, resp.content)
+        return process_response(resp.status_code, resp.content)

pusher/http.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (print_function, unicode_literals, absolute_import,
-                        division)
+from __future__ import (
+    print_function,
+    unicode_literals,
+    absolute_import,
+    division)
+
 from pusher.errors import *
 from pusher.signature import sign
 from pusher.version import VERSION
@@ -12,47 +16,62 @@
 import six
 import time
 
+
 GET, POST, PUT, DELETE = "GET", "POST", "PUT", "DELETE"
 
+
 class RequestMethod(object):
     def __init__(self, client, f):
         self.client = client
         self.f = f
 
+
     def __call__(self, *args, **kwargs):
         return self.client.http.send_request(self.make_request(*args, **kwargs))
 
+
     def make_request(self, *args, **kwargs):
         return self.f(self.client, *args, **kwargs)
 
+
 def doc_string(doc):
     def decorator(f):
         f.__doc__ = doc
         return f
+
     return decorator
 
+
 def request_method(f):
     @property
     @doc_string(f.__doc__)
     def wrapped(self):
         return RequestMethod(self, f)
+
     return wrapped
 
+
 def make_query_string(params):
     return '&'.join(map('='.join, sorted(params.items(), key=lambda x: x[0])))
 
+
 def process_response(status, body):
     if status == 200 or status == 202:
         return json.loads(body)
+
     elif status == 400:
         raise PusherBadRequest(body)
+
     elif status == 401:
         raise PusherBadAuth(body)
+
     elif status == 403:
         raise PusherForbidden(body)
+
     else:
         raise PusherBadStatus("%s: %s" % (status, body))
 
+
 class Request(object):
     """Represents the request to be made to the Pusher API.
 
@@ -67,56 +86,68 @@ class Request(object):
     def __init__(self, client, method, path, params=None):
         if params is None:
             params = {}
+
         self.client = client
         self.method = method
         self.path = path
         self.params = copy.copy(params)
         if method == POST:
             self.body = six.text_type(json.dumps(params)).encode('utf8')
             self.query_params = {}
+
         elif method == GET:
             self.body = bytes()
             self.query_params = params
+
         else:
             raise NotImplementedError("Only GET and POST supported")
+
         self._generate_auth()
 
+
     def _generate_auth(self):
         self.body_md5 = hashlib.md5(self.body).hexdigest()
         self.query_params.update({
             'auth_key': self.client.key,
             'body_md5': six.text_type(self.body_md5),
             'auth_version': '1.0',
-            'auth_timestamp': '%.0f' % time.time()
-        })
+            'auth_timestamp': '%.0f' % time.time()})
 
         auth_string = '\n'.join([
             self.method,
             self.path,
-            make_query_string(self.query_params)
-        ])
+            make_query_string(self.query_params)])
+
+        self.query_params['auth_signature'] = sign(
+            self.client.secret, auth_string)
 
-        self.query_params['auth_signature'] = sign(self.client.secret, auth_string)
 
     @property
     def query_string(self):
         return make_query_string(self.query_params)
 
+
     @property
     def signed_path(self):
         return "%s?%s" % (self.path, self.query_string)
 
+
     @property
     def url(self):
         return "%s%s" % (self.base_url, self.signed_path)
 
+
     @property
     def base_url(self):
-        return "%s://%s:%s" % (self.client.scheme, self.client.host, self.client.port)
+        return (
+            "%s://%s:%s" %
+            (self.client.scheme, self.client.host, self.client.port))
+
 
     @property
     def headers(self):
         hdrs = {"X-Pusher-Library": "pusher-http-python " + VERSION}
         if self.method == POST:
             hdrs["Content-Type"] = "application/json"
+
         return hdrs

pusher/notification_client.py

@@ -50,7 +50,8 @@ def notify(self, interests, notification):
             'interests': interests}
 
         params.update(notification)
-        path = "/%s/%s/apps/%s/notifications" %
-            (API_PREFIX, API_VERSION, self.app_id)
+        path = (
+            "/%s/%s/apps/%s/notifications" %
+            (API_PREFIX, API_VERSION, self.app_id))
 
         return Request(self, POST, path, params)

pusher/pusher.py

@@ -213,6 +213,7 @@ def validate_webhook(self, key, signature, body):
 
         try:
             body_data = json.loads(body, cls=self._json_decoder)
+
         except ValueError:
             return None
 

pusher/pusher_client.py

@@ -39,9 +39,9 @@ def __init__(
             self._host = ensure_text(host, "host")
 
         elif cluster:
-            self._host = six.text_type("api-%s.pusher.com") %
-                ensure_text(cluster, "cluster")
-
+            self._host = (
+                six.text_type("api-%s.pusher.com") %
+                ensure_text(cluster, "cluster"))
         else:
             self._host = six.text_type("api.pusherapp.com")
 

pusher/requests.py

@@ -1,19 +1,25 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import (print_function, unicode_literals, absolute_import,
-                        division)
+from __future__ import (
+    print_function,
+    unicode_literals,
+    absolute_import,
+    division)
+
 from pusher.http import process_response
 
 import requests
 import sys
 import os
 
+
 if sys.version_info < (3,):
     import urllib3.contrib.pyopenssl
     urllib3.contrib.pyopenssl.inject_into_urllib3()
 
 CERT_PATH = os.path.dirname(os.path.abspath(__file__)) + '/cacert.pem'
 
+
 class RequestsBackend(object):
     """Adapter for the requests module.
 
@@ -24,16 +30,17 @@ def __init__(self, client, **options):
         self.client = client
         self.options = options
         if self.client.ssl:
-            self.options.update({'verify': CERT_PATH})        
+            self.options.update({'verify': CERT_PATH})
         self.session = requests.Session()
 
+
     def send_request(self, request):
         resp = self.session.request(
             request.method,
             request.url,
             headers=request.headers,
             data=request.body,
             timeout=self.client.timeout,
-            **self.options
-        )
+            **self.options)
+
         return process_response(resp.status_code, resp.text)