Merge remote-tracking branch 'mpdavis/master'

Author: Gasper Zejn

.travis.yml

@@ -1,19 +1,22 @@
-sudo: false
 # Travis infra requires pinning dist:precise, at least as of 2017-09-01
 # detail: https://blog.travis-ci.com/2017-06-21-trusty-updates-2017-Q2-launch
 dist: precise
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
   - "pypy-5.3.1"
 install:
-  - pip install -U tox codecov tox-travis
+  - pip install -U setuptools && pip install -U tox codecov tox-travis
 script:
   - tox
 after_success:
-- codecov
+  - codecov
+# matrix:
+#   include:
+#     - python: 3.6
+#       env:
+#         - TOX_ENV=flake8
+#       script: tox -e $TOX_ENV

README.rst

@@ -16,13 +16,6 @@ expected that most applications will only use a small set of algorithms
 to meet their needs.
 
 
-Principles
-----------
-
-This is a JOSE implementation that is fully compatible with Google App Engine
-which requires the use of the PyCrypto library.
-
-
 Installation
 ------------
 
@@ -31,6 +24,20 @@ Installation
     $ pip install python-jose
 
 
+Custom Backends
+---------------
+
+As of 2.0.0, python-jose uses pycryptodome by default for RSA signing and verification. If
+necessary, other RSA backends are supported. Both pycrpyto and crytography are options.
+
+In order to use a custom backend, install python-jose with the appropriate extra.
+
+::
+
+    $ pip install python-jose[pycrypto]
+    $ pip install python-jose[crytography]
+
+
 Usage
 -----
 

jose/__init__.py

@@ -1,5 +1,5 @@
 
-__version__ = "1.4.0"
+__version__ = "2.0.2"
 __author__ = 'Michael Davis'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2016 Michael Davis'

jose/backends/__init__.py

@@ -3,7 +3,7 @@
     from jose.backends.pycrypto_backend import RSAKey
 except ImportError:
     from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey
-
+    
 try:
     from jose.backends.cryptography_backend import CryptographyECKey as ECKey
 except ImportError:

jose/backends/pycrypto_backend.py

@@ -14,12 +14,15 @@
 from jose.exceptions import JWKError
 from jose.utils import base64url_decode
 
-# PyCryptodome's RSA module doesn't have PyCrypto's _RSAobj class
-# Instead it has a class named RsaKey, which serves the same purpose.
-if hasattr(RSA, '_RSAobj'):
-    _RSAKey = RSA._RSAobj
-else:
+
+# We default to using PyCryptodome, however, if PyCrypto is installed, it is
+# used instead. This is so that environments that require the use of PyCrypto
+# are still supported.
+if hasattr(RSA, 'RsaKey'):
     _RSAKey = RSA.RsaKey
+else:
+    _RSAKey = RSA._RSAobj
+    
 
 
 class RSAKey(Key):

jose/jwt.py

@@ -102,6 +102,8 @@ def decode(token, key, algorithms=None, options=None, audience=None,
 
     Raises:
         JWTError: If the signature is invalid in any way.
+        ExpiredSignatureError: If the signature has expired.
+        JWTClaimsError: If any claim is invalid in any way.
 
     Examples:
 

setup.py

@@ -4,8 +4,6 @@
 import sys
 import jose
 
-import platform
-
 from setuptools import setup
 
 
@@ -24,17 +22,10 @@ def get_packages(package):
     ]
 
 
-def get_install_requires():
-    if sys.platform == "win32" or platform.python_implementation() == 'PyPy':
-        crypto_lib = 'pycryptodome >=3.3.1, <3.4.0'
-    else:
-        crypto_lib = 'pycrypto >=2.6.0, <2.7.0'
-    return [
-        crypto_lib,
-        'six <2.0',
-        'ecdsa <1.0',
-        'future <1.0',
-    ]
+extras_require = {
+    'cryptography': ['cryptography'],
+    'pycrypto': ['pycrypto >=2.6.0, <2.7.0'],
+}
 
 
 setup(
@@ -63,5 +54,6 @@ def get_install_requires():
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
     ],
-    install_requires=get_install_requires()
+    extras_require=extras_require,
+    install_requires=['six <2.0', 'ecdsa <1.0', 'future <1.0', 'pycryptodome >=3.3.1, <4.0.0']
 )

tox.ini

@@ -1,5 +1,6 @@
 [tox]
-envlist = py{26,27,33,34,py}
+envlist = py{27,34,35,36,py},flake8
+skip_missing_interpreters = True
 
 [testenv]
 commands =
@@ -13,3 +14,8 @@ deps =
     pytest-runner
     cryptography
 
+; [testenv:flake8]
+; commands = flake8 jose
+; skip_install= True
+; deps =
+;     flake8