Merge pull request #216 from asherf/compat

Remove python 2.7 & 3.5 from test matrix. remove pycrypto backend

Author: asherf

.travis.yml

@@ -14,39 +14,15 @@ jobs:
 matrix:
   include:
     # Linting
-    - python: 3.6
+    - python: 3.9
       env: TOXENV=flake8
-    # CPython 2.7
-    - python: 2.7
-      env: TOXENV=py27-base
-    - python: 2.7
-      env: TOXENV=py27-cryptography-only
-    - python: 2.7
-      env: TOXENV=py27-pycryptodome-norsa
-    - python: 2.7
-      env: TOXENV=py27-pycrypto-norsa
-    - python: 2.7
-      env: TOXENV=py27-compatibility
-    # CPython 3.5
-    - python: 3.5
-      env: TOXENV=py35-base
-    - python: 3.5
-      env: TOXENV=py35-cryptography-only
-    - python: 3.5
-      env: TOXENV=py35-pycryptodome-norsa
-    - python: 3.5
-      env: TOXENV=py35-pycrypto-norsa
-    - python: 3.5
-      env: TOXENV=py35-compatibility
     # CPython 3.6
     - python: 3.6
       env: TOXENV=py36-base
     - python: 3.6
       env: TOXENV=py36-cryptography-only
     - python: 3.6
       env: TOXENV=py36-pycryptodome-norsa
-    - python: 3.6
-      env: TOXENV=py36-pycrypto-norsa
     - python: 3.6
       env: TOXENV=py36-compatibility
     # CPython 3.7
@@ -56,8 +32,6 @@ matrix:
       env: TOXENV=py37-cryptography-only
     - python: 3.7
       env: TOXENV=py37-pycryptodome-norsa
-    - python: 3.7
-      env: TOXENV=py37-pycrypto-norsa
     - python: 3.7
       env: TOXENV=py37-compatibility
     # CPython 3.8
@@ -67,8 +41,6 @@ matrix:
       env: TOXENV=py38-cryptography-only
     - python: 3.8
       env: TOXENV=py38-pycryptodome-norsa
-    - python: 3.8
-      env: TOXENV=py38-pycrypto-norsa
     - python: 3.8
       env: TOXENV=py38-compatibility
     # CPython 3.9 - dev
@@ -78,29 +50,14 @@ matrix:
       env: TOXENV=py39-cryptography-only
     - python: 3.9-dev
       env: TOXENV=py39-pycryptodome-norsa
-    - python: 3.9-dev
-      env: TOXENV=py39-pycrypto-norsa
     - python: 3.9-dev
       env: TOXENV=py39-compatibility
-    # PyPy 2.7
-    - python: pypy2
-      env: TOXENV=pypy-base
-    - python: pypy2
-      env: TOXENV=pypy-cryptography-only
-    - python: pypy2
-      env: TOXENV=pypy-pycryptodome-norsa
-    - python: pypy2
-      env: TOXENV=pypy-pycrypto-norsa
-    - python: pypy2
-      env: TOXENV=pypy-compatibility
     # PyPy 3.x
     - python: pypy3
       env: TOXENV=pypy-base
     - python: pypy3
       env: TOXENV=pypy3-cryptography-only
     - python: pypy3
       env: TOXENV=pypy3-pycryptodome-norsa
-    - python: pypy3
-      env: TOXENV=pypy3-pycrypto-norsa
     - python: pypy3
       env: TOXENV=pypy3-compatibility

jose/backends/__init__.py

@@ -10,19 +10,9 @@
     from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey  # noqa: F401
 except ImportError:
     try:
-        from jose.backends.pycrypto_backend import RSAKey  # noqa: F401
-
-        # time.clock was deprecated in python 3.3 in favor of time.perf_counter
-        # and removed in python 3.8. pycrypto was never updated for this. If
-        # time has no clock attribute, let it use perf_counter instead to work
-        # in 3.8+
-        # noinspection PyUnresolvedReferences
-        import time
-        if not hasattr(time, "clock"):
-            time.clock = time.perf_counter
-
-    except ImportError:
         from jose.backends.rsa_backend import RSAKey  # noqa: F401
+    except ImportError:
+        RSAKey = None
 
 try:
     from jose.backends.cryptography_backend import CryptographyECKey as ECKey  # noqa: F401
@@ -32,10 +22,7 @@
 try:
     from jose.backends.cryptography_backend import CryptographyAESKey as AESKey  # noqa: F401
 except ImportError:
-    try:
-        from jose.backends.pycrypto_backend import AESKey  # noqa: F401
-    except ImportError:
-        AESKey = None
+    AESKey = None
 
 try:
     from jose.backends.cryptography_backend import CryptographyHMACKey as HMACKey  # noqa: F401

jose/backends/_asn1.py

@@ -1,6 +1,6 @@
 """ASN1 encoding helpers for converting between PKCS1 and PKCS8.
 
-Required by rsa_backend and pycrypto_backend but not cryptography_backend.
+Required by rsa_backend but not cryptography_backend.
 """
 from pyasn1.codec.der import decoder, encoder
 from pyasn1.type import namedtype, univ