Merge pull request #23 from web-push-libs/bug/18

Bug/18

Author: jrconlin

pywebpush/__init__.py

@@ -152,7 +152,7 @@ def encode(self, data):
             'body': encrypted,
         })
 
-    def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
+    def send(self, data, headers=None, ttl=0, gcm_key=None, reg_id=None):
         """Encode and send the data to the Push Service.
 
         :param data: A serialized block of data (see encode() ).
@@ -167,6 +167,8 @@ def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
 
         """
         # Encode the data.
+        if headers is None:
+            headers = dict()
         encoded = self.encode(data)
         # Append the p256dh to the end of any existing crypto-key
         headers = CaseInsensitiveDict(headers)
@@ -192,7 +194,7 @@ def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
             if not reg_id:
                 reg_id = self.subscription_info['endpoint'].rsplit('/', 1)[-1]
             reg_ids.append(reg_id)
-            data = {}
+            data = dict()
             data['registration_ids'] = reg_ids
             data['raw_data'] = base64.b64encode(
                 encoded.get('body')).decode('utf8')
@@ -206,7 +208,7 @@ def send(self, data, headers={}, ttl=0, gcm_key=None, reg_id=None):
             endpoint = self.subscription_info['endpoint']
 
         if 'ttl' not in headers or ttl:
-            headers['ttl'] = str(ttl)
+            headers['ttl'] = str(ttl or 0)
         # Additionally useful headers:
         # Authorization / Crypto-Key (VAPID headers)
         return self._post(endpoint, encoded_data, headers)

pywebpush/tests/test_webpush.py

@@ -102,13 +102,25 @@ def test_send(self, mock_post):
         WebPusher(subscription_info).send(data, headers)
         eq_(subscription_info.get('endpoint'), mock_post.call_args[0][0])
         pheaders = mock_post.call_args[1].get('headers')
-        eq_(pheaders.get('ttl'), "0")
+        eq_(pheaders.get('ttl'), '0')
         ok_('encryption' in pheaders)
         eq_(pheaders.get('AUTHENTICATION'), headers.get('Authentication'))
         ckey = pheaders.get('crypto-key')
         ok_('pre-existing' in ckey)
         eq_(pheaders.get('content-encoding'), 'aesgcm')
 
+    @patch("requests.post")
+    def test_send_no_headers(self, mock_post):
+        recv_key = pyelliptic.ECC(curve="prime256v1")
+        subscription_info = self._gen_subscription_info(recv_key)
+        data = "Mary had a little lamb"
+        WebPusher(subscription_info).send(data)
+        eq_(subscription_info.get('endpoint'), mock_post.call_args[0][0])
+        pheaders = mock_post.call_args[1].get('headers')
+        eq_(pheaders.get('ttl'), '0')
+        ok_('encryption' in pheaders)
+        eq_(pheaders.get('content-encoding'), 'aesgcm')
+
     def test_ci_dict(self):
         ci = CaseInsensitiveDict({"Foo": "apple", "bar": "banana"})
         eq_('apple', ci["foo"])

requirements.txt

@@ -1,4 +1,4 @@
 http-ece==0.5.0
-python-jose==1.2.0
-requests==2.11.*
+python-jose
+requests
 flake8