pep8

tschellenbach · tschellenbach · commit 9649584b01ef · 2014-11-10T12:57:26.000+01:00
diff --git a/stream/__init__.py b/stream/__init__.py
@@ -17,7 +17,7 @@ def connect(api_key=None, api_secret=None, app_id=None, version='v1.0', timeout=
 
     :param api_key: your api key or heroku url
     :param api_secret: the api secret
-    :param app_id: the site id (used for listening to feed changes)
+    :param app_id: the app id (used for listening to feed changes)
     '''
     from stream.client import StreamClient
     stream_url = os.environ.get('STREAM_URL')
diff --git a/stream/client.py b/stream/client.py
@@ -69,11 +69,11 @@ def get_default_params(self):
         '''
         params = dict(api_key=self.api_key)
         return params
-    
+
     def get_full_url(self, relative_url):
         url = self.base_url + self.version + '/' + relative_url
         return url
-    
+
     def get_user_agent(self):
         from stream import __version__
         agent = 'stream-javascript-client-%s' % __version__
@@ -108,7 +108,7 @@ def raise_exception(self, result, status_code):
         if exception_fields is not None:
             errors = []
             for field, errors in exception_fields.items():
-                errors.append('Field "%s" errors: %s' % 
+                errors.append('Field "%s" errors: %s' %
                               (field, repr(errors)))
             error_message = '\n'.join(errors)
         error_code = result.get('code')
diff --git a/stream/feed.py b/stream/feed.py
@@ -17,7 +17,7 @@ def __init__(self, client, feed_slug, user_id, token):
         self.user_id = user_id
         self.id = '%s:%s' % (feed_slug, user_id)
         self.token = token
-        
+
         self.feed_url = 'feed/%s/' % self.id.replace(':', '/')
         self.feed_together = self.id.replace(':', '')
         self.signature = self.feed_together + ' ' + self.token
@@ -83,7 +83,7 @@ def remove_activity(self, activity_id=None, foreign_id=None):
         result = self.client.delete(
             url, signature=self.signature, params=params)
         return result
-    
+
     def get(self, **params):
         '''
         Get the activities in this feed
@@ -119,7 +119,7 @@ def follow(self, target_feed_slug, target_user_id):
         response = self.client.post(
             url, data=data, signature=self.signature)
         return response
-    
+
     def unfollow(self, target_feed_slug, target_user_id):
         '''
         Unfollow the given feed
diff --git a/stream/signing.py b/stream/signing.py
@@ -2,9 +2,11 @@
 import hashlib
 import base64
 
+
 def b64_encode(s):
     return base64.urlsafe_b64encode(s).strip(b'=')
 
+
 def sign(api_secret, feed_id):
     '''
     Base64 encoded sha1 signature
diff --git a/stream/tests.py b/stream/tests.py
@@ -44,13 +44,14 @@ def test_heroku(self):
         self.assertEqual(client.api_key, 'thierry')
         self.assertEqual(client.api_secret, 'pass')
         self.assertEqual(client.site_id, '1')
-        
+
     def test_heroku_real(self):
         url = 'https://bvt88g4kvc63:twc5ywfste5bm2ngqkzs7ukxk3pn96yweghjrxcmcrarnt3j4dqj3tucbhym5wfd@getstream.io/?app=669'
         os.environ['STREAM_URL'] = url
         client = stream.connect()
         self.assertEqual(client.api_key, 'bvt88g4kvc63')
-        self.assertEqual(client.api_secret, 'twc5ywfste5bm2ngqkzs7ukxk3pn96yweghjrxcmcrarnt3j4dqj3tucbhym5wfd')
+        self.assertEqual(
+            client.api_secret, 'twc5ywfste5bm2ngqkzs7ukxk3pn96yweghjrxcmcrarnt3j4dqj3tucbhym5wfd')
         self.assertEqual(client.site_id, '669')
 
     def test_heroku_overwrite(self):
@@ -386,7 +387,7 @@ def test_uniqueness_foreign_id(self):
         self.assertEqual(activities[0]['foreign_id'], 'tweet:11')
         self.assertDatetimeAlmostEqual(activities[0]['time'], utcnow)
         self.assertNotEqual(activities[1]['foreign_id'], 'tweet:11')
-        
+
     def test_time_ordering(self):
         '''
         datetime.datetime.utcnow() is our recommended approach
