Clean up extraneous whitespace

Author: mdpye

pusher/util.py

@@ -26,7 +26,7 @@
 if sys.version_info < (3,):
     byte_type = 'a python2 str'
 else:
-    byte_type = 'a python3 bytes' 
+    byte_type = 'a python3 bytes'
 
 def ensure_text(obj, name):
     if isinstance(obj, six.text_type):

pusher_tests/test_crypto.py

@@ -9,7 +9,6 @@
 
 class TestCrypto(unittest.TestCase):
 
-
     def test_is_encrypted_channel(self):
         # testcases matrix with inputs and expected returning values
         testcases = [
@@ -32,9 +31,8 @@ def test_is_encrypted_channel(self):
               crypto.is_encrypted_channel( t["input"] ),
               t["expected"]
           )
-    
-    def test_is_encryption_master_key_valid(self):
 
+    def test_is_encryption_master_key_valid(self):
         testcases = [
           { "input":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "expected":True },
           { "input":"                                ", "expected":True },
@@ -49,9 +47,8 @@ def test_is_encryption_master_key_valid(self):
               crypto.is_encryption_master_key_valid( t["input"] ),
               t["expected"]
           )
-    
+
     def test_generate_shared_secret(self):
-        
         testcases = [
           {
             "input": ["pvUPIk0YG6MnxCEMIUUVFrbDmQwbhICXUcy",
@@ -66,7 +63,7 @@ def test_generate_shared_secret(self):
               crypto.generate_shared_secret( ensure_binary(t["input"][0],'t["input"][0]'), ensure_binary(t["input"][1],'t["input"][1]') ),
               t["expected"]
           )
-    
+
     def test_encrypt(self):
         testcases = [
           {
@@ -95,6 +92,6 @@ def test_encrypt(self):
               ),
               t["expected"]
           )
-    
+
     def test_decrypt(self):
         self.assertEqual(True, True)

pusher_tests/test_pusher_client.py

@@ -162,7 +162,7 @@ def test_trigger_batch_with_mixed_channels_success_case(self):
         )
 
         # simulate the same encryption process and check equality
-        encryp_master_key = ensure_binary(encryp_master_key,"encryp_master_key")
+        encryp_master_key = ensure_binary(encryp_master_key, "encryp_master_key")
         chan_2 = ensure_binary(chan_2,"chan_2")
         shared_secret = generate_shared_secret(chan_2, encryp_master_key)
 
@@ -180,7 +180,7 @@ def test_trigger_batch_with_mixed_channels_success_case(self):
         cipher_text_b64 = base64.b64encode(cipher_text)
 
         # format expected output
-        json_dumped_2 = json.dumps({ "nonce" : nonce_b64.decode("utf-8"), "ciphertext": cipher_text_b64.decode("utf-8") } , ensure_ascii=False)
+        json_dumped_2 = json.dumps({ "nonce" : nonce_b64.decode("utf-8"), "ciphertext": cipher_text_b64.decode("utf-8") }, ensure_ascii=False)
 
         expected_params = {
             u'batch': [{
@@ -198,7 +198,6 @@ def test_trigger_batch_with_mixed_channels_success_case(self):
         self.assertEqual(request.params, expected_params)
 
     def test_trigger_with_private_encrypted_channel_string_fail_case_no_encryption_master_key_specified(self):
-
         pc = PusherClient(app_id=u'4', key=u'key', secret=u'secret', ssl=True)
 
         with self.assertRaises(ValueError):
@@ -222,7 +221,6 @@ def test_trigger_with_public_channel_with_encryption_master_key_specified_succes
             self.assertEqual(request.params, expected_params)
 
     def test_trigger_with_private_encrypted_channel_success(self):
-
         # instantiate a new client configured with the master encryption key
         encryp_master_key=u'8tW5FQLniQ1sBQFwrw7t6TVEsJZd10yY'
         pc = PusherClient(app_id=u'4', key=u'key', secret=u'secret', encryption_master_key=encryp_master_key, ssl=True)