Format args so they can be read

Author: mdpye

pusher/pusher_client.py

@@ -36,16 +36,38 @@
 
 class PusherClient(Client):
     def __init__(
-            self, app_id, key, secret, ssl=True,
-            host=None, port=None,
-            timeout=5, cluster=None,
+            self,
+            app_id,
+            key,
+            secret,
+            ssl=True,
+            host=None,
+            port=None,
+            timeout=5,
+            cluster=None,
             encryption_master_key=None,
-            json_encoder=None, json_decoder=None,
-            backend=None, **backend_options):
+            encryption_master_key_base64=None,
+            json_encoder=None,
+            json_decoder=None,
+            backend=None,
+            **backend_options):
+
+        parsed_master_key = parse_master_key(encryption_master_key, encryption_master_key_base64)
+
         super(PusherClient, self).__init__(
-            app_id, key, secret, ssl, host, port, timeout, cluster,
-            encryption_master_key, json_encoder, json_decoder,
-            backend, **backend_options)
+                app_id,
+                key,
+                secret,
+                ssl,
+                host,
+                port,
+                timeout,
+                cluster,
+                parsed_master_key,
+                json_encoder,
+                json_decoder,
+                backend,
+                **backend_options)
 
         if host:
             self._host = ensure_text(host, "host")
@@ -112,7 +134,6 @@ def trigger_batch(self, batch=[], already_encoded=False):
         """
         if not already_encoded:
             for event in batch:
-
                 validate_channel(event['channel'])
 
                 event_name = ensure_text(event['name'], "event_name")