Use six.text_type instead of six.string_types (#119)

In Python 2, using six.string_types causes the code to attempt to re-encode already encoded data because six.string_types matches Python 2 str and unicode data.  Using six.text_type makes sure that the code only attempts to encode unicode data.

Author: scyclops

pywebpush/__init__.py

@@ -152,7 +152,7 @@ def __init__(self, subscription_info, requests_session=None,
             for k in ['p256dh', 'auth']:
                 if keys.get(k) is None:
                     raise WebPushException("Missing keys value: {}".format(k))
-                if isinstance(keys[k], six.string_types):
+                if isinstance(keys[k], six.text_type):
                     keys[k] = bytes(keys[k].encode('utf8'))
             receiver_raw = base64.urlsafe_b64decode(
                 self._repad(keys['p256dh']))
@@ -206,7 +206,7 @@ def encode(self, data, content_encoding="aes128gcm"):
             format=serialization.PublicFormat.UncompressedPoint
         )
 
-        if isinstance(data, six.string_types):
+        if isinstance(data, six.text_type):
             data = bytes(data.encode('utf8'))
         if content_encoding == "aes128gcm":
             self.verb("Encrypting to aes128gcm...")