Merge pull request #76 from web-push-libs/feat/75

feat: Update to cryptography 2.0.3

Author: jrconlin

README.rst

@@ -121,8 +121,8 @@ object.
 
 The following methods are available:
 
-``.send(data, headers={}, ttl=0, gcm_key="", reg_id="", content_encoding="aesgcm", curl=False)``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+``.send(data, headers={}, ttl=0, gcm_key="", reg_id="", content_encoding="aesgcm", curl=False, timeout=None)``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Send the data using additional parameters. On error, returns a
 ``WebPushException``
@@ -149,6 +149,9 @@ will write the encrypted content to a local file named
 ``encrpypted.data``. This command is meant to be used for debugging
 purposes.
 
+*timeout* timeout for requests POST query. See `requests
+documentation <http://docs.python-requests.org/en/master/user/quickstart/#timeouts>`__.
+
 **Example**
 
 to send from Chrome using the old GCM mode:

pywebpush/__init__.py

@@ -353,7 +353,7 @@ def webpush(subscription_info,
             vv = Vapid.from_file(
                 private_key_file=vapid_private_key)  # pragma no cover
         else:
-            vv = Vapid.from_raw(private_raw=vapid_private_key.encode())
+            vv = Vapid.from_der(private_key=vapid_private_key.encode())
         vapid_headers = vv.sign(vapid_claims)
     result = WebPusher(subscription_info).send(
         data,

requirements.txt

@@ -1,4 +1,4 @@
-cryptography>=1.8.1,<1.10
+cryptography>=1.8.1,<=2.3.0
 http-ece>=1.0.1
 requests>=2.13.0
-py-vapid>=1.2.5
+py-vapid>=1.3.0

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 
 def read_from(file):