2.7 support

Author: mdpye

pusher/crypto.py

@@ -14,7 +14,8 @@
 from pusher.util import (
     ensure_text,
     ensure_binary,
-    data_to_string)
+    data_to_string,
+    is_base64)
 
 import nacl.secret
 import nacl.utils
@@ -47,14 +48,14 @@ def parse_master_key(encryption_master_key, encryption_master_key_base64):
             raise ValueError("encryption_master_key must be 32 bytes long. It is also deprecated, please use encryption_master_key_base64")
 
     if encryption_master_key_base64 is not None:
-        try:
-            decoded = base64.b64decode(encryption_master_key_base64, validate=True)
+        if is_base64(encryption_master_key_base64):
+            decoded = base64.b64decode(encryption_master_key_base64)
 
             if len(decoded) == 32:
                 return decoded
             else:
                 raise ValueError("encryption_master_key_base64 must be a base64 string which decodes to 32 bytes")
-        except binascii.Error:
+        else:
             raise ValueError("encryption_master_key_base64 must be valid base64")
 
     return None

pusher/util.py

@@ -56,6 +56,17 @@ def ensure_binary(obj, name):
     raise TypeError("%s should be %s instead it is a %s" % (name, byte_type, type(obj)))
 
 
+def is_base64(s):
+    """
+    is_base64 tests whether a string is valid base64 by testing that it round-trips accurately.
+    This is required because python 2.7 does not have a Validate option to the decoder.
+    """
+    try:
+        s = six.ensure_binary(s, "utf-8")
+        return base64.b64encode(base64.b64decode(s)) == s
+    except Exception as e:
+        return False
+
 def validate_channel(channel):
     channel = ensure_text(channel, "channel")
 

pusher_tests/test_crypto.py

@@ -2,6 +2,7 @@
 from __future__ import print_function, absolute_import
 
 import json
+import six
 import unittest
 
 from pusher import crypto
@@ -57,8 +58,7 @@ def test_parse_master_key_rejections(self):
             ]
 
         for t in testcases:
-            with self.assertRaisesRegex(ValueError, t["expected"]):
-                crypto.parse_master_key(t["deprecated"], t["base64"])
+            six.assertRaisesRegex(self, ValueError, t["expected"], lambda: crypto.parse_master_key(t["deprecated"], t["base64"]))
 
     def test_generate_shared_secret(self):
         testcases = [