Sem-Ver: api-break Drop support for python 2.7

* Sem-Ver: api-break Drop support for python 2.7

Signed-off-by: David Black <[email protected]>

* Sem-Ver: bugfix upgrade the version of Django used for testing to be >= 2.2.8 and < 3.0.0.

Signed-off-by: David Black <[email protected]>

* Sem-Ver: bugfix Use the built in version of mock.

Signed-off-by: David Black <[email protected]>

* Sem-Ver: bugfix Fix various deprecation warnings.

Signed-off-by: David Black <[email protected]>

Author: dbaxa

.travis.yml

@@ -1,14 +1,12 @@
 sudo: false
 language: python
 python:
-  - "2.7"
   - "3.5"
   - "3.6"
   - "3.7"
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 || $TRAVIS_PYTHON_VERSION == 3.6 || $TRAVIS_PYTHON_VERSION == 3.7 ]]; then pip install aiohttp==3.6.2 asynctest==0.13.0; fi
   - pip install -q pycodestyle==2.6.0 flake8==3.8.1
 script:
   - pycodestyle .
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 || $TRAVIS_PYTHON_VERSION == 3.6 || $TRAVIS_PYTHON_VERSION == 3.7 ]]; then flake8 . ; fi
+  - flake8 .
   - python -Wd setup.py nosetests

atlassian_jwt_auth/contrib/tests/aiohttp/__init__.py

@@ -1,16 +0,0 @@
-import sys
-
-import nose
-
-
-if sys.version_info < (3, 5):
-    raise nose.SkipTest('Skipping tests for Python version < 3.5')
-else:
-    try:
-        import asynctest  # noqa
-    except ImportError:
-        raise nose.SkipTest(
-            'Skipping tests because asynctest is not installed')
-
-del sys
-del nose

atlassian_jwt_auth/frameworks/common/backend.py

@@ -1,8 +1,5 @@
 from abc import ABCMeta, abstractmethod, abstractproperty
-try:
-    from functools import lru_cache
-except ImportError:
-    from backports.functools_lru_cache import lru_cache
+from functools import lru_cache
 
 from atlassian_jwt_auth import HTTPSPublicKeyRetriever, JWTAuthVerifier
 

atlassian_jwt_auth/key.py

@@ -3,7 +3,7 @@
 import logging
 import os
 import re
-import sys
+from urllib.parse import unquote_plus
 
 import cachecontrol
 import cryptography.hazmat.backends
@@ -17,10 +17,6 @@
                                            PublicKeyRetrieverException,
                                            PrivateKeyRetrieverException)
 
-if sys.version_info[0] >= 3:
-    from urllib.parse import unquote_plus
-else:
-    from urllib import unquote_plus
 
 PEM_FILE_TYPE = 'application/x-pem-file'
 
@@ -159,9 +155,10 @@ def retrieve(self, key_identifier, **requests_kwargs):
             except (RequestException, PublicKeyRetrieverException) as e:
                 self.handle_retrieval_exception(retriever, e)
                 logger = logging.getLogger(__name__)
-                logger.warn('Unable to retrieve public key from store',
-                            extra={'underlying_error': str(e),
-                                   'key repository': retriever.base_url})
+                logger.warning(
+                    'Unable to retrieve public key from store',
+                    extra={'underlying_error': str(e),
+                           'key repository': retriever.base_url})
         raise PublicKeyRetrieverException(
             'Cannot load key from key repositories')
 

atlassian_jwt_auth/tests/test_public_key_provider.py

@@ -1,8 +1,8 @@
 import os
 import re
 import unittest
+from unittest import mock
 
-import mock
 import httptest
 import requests
 

atlassian_jwt_auth/tests/test_signer.py

@@ -1,7 +1,7 @@
 import datetime
 import unittest
+from unittest import mock
 
-import mock
 from cryptography.hazmat.primitives import serialization
 
 import atlassian_jwt_auth

atlassian_jwt_auth/tests/test_signer_private_key_repo.py

@@ -55,12 +55,12 @@ def test_picks_last_valid_key_id(self):
 
     def test_fails_if_issuer_has_no_valid_keys(self):
         signer = self.create_signer_for_issuer('invalid-issuer')
-        with self.assertRaisesRegexp(IOError, 'Issuer has no valid keys'):
+        with self.assertRaisesRegex(IOError, 'Issuer has no valid keys'):
             signer.generate_jwt('audience')
 
     def test_fails_if_issuer_does_not_exist(self):
         signer = self.create_signer_for_issuer('this-does-not-exist')
-        with self.assertRaisesRegexp(OSError, 'No such file or directory'):
+        with self.assertRaisesRegex(OSError, 'No such file or directory'):
             signer.generate_jwt('audience')
 
 

atlassian_jwt_auth/tests/test_verifier.py

@@ -1,9 +1,9 @@
 import datetime
 import unittest
+from unittest import mock
 
 import jwt
 import jwt.exceptions
-import mock
 
 import atlassian_jwt_auth
 import atlassian_jwt_auth.exceptions
@@ -94,7 +94,7 @@ def test_verify_jwt_with_key_identifier_not_starting_with_issuer(self):
             algorithm=self.algorithm,
         )
         a_jwt = signer.generate_jwt(self._example_aud)
-        with self.assertRaisesRegexp(ValueError, 'Issuer does not own'):
+        with self.assertRaisesRegex(ValueError, 'Issuer does not own'):
             verifier.verify_jwt(a_jwt, self._example_aud)
 
     @mock.patch('atlassian_jwt_auth.verifier.jwt.decode')
@@ -113,7 +113,7 @@ def test_verify_jwt_with_non_matching_sub_and_iss(self, m_j_decode):
             ValueError,
             atlassian_jwt_auth.exceptions.SubjectDoesNotMatchIssuerException,
         ]:
-            with self.assertRaisesRegexp(exception, expected_msg):
+            with self.assertRaisesRegex(exception, expected_msg):
                 verifier.verify_jwt(a_jwt, self._example_aud)
 
     @mock.patch('atlassian_jwt_auth.verifier.jwt.decode')
@@ -129,7 +129,7 @@ def test_verify_jwt_with_jwt_lasting_gt_max_time(self, m_j_decode):
         m_j_decode.return_value = claims
         a_jwt = self._jwt_auth_signer.generate_jwt(self._example_aud)
         verifier = self._setup_jwt_auth_verifier(self._public_key_pem)
-        with self.assertRaisesRegexp(ValueError, expected_msg):
+        with self.assertRaisesRegex(ValueError, expected_msg):
             verifier.verify_jwt(a_jwt, self._example_aud)
 
     def test_verify_jwt_with_jwt_with_already_seen_jti(self):
@@ -146,7 +146,7 @@ def test_verify_jwt_with_jwt_with_already_seen_jti(self):
         for exception in [
                 ValueError,
                 atlassian_jwt_auth.exceptions.JtiUniquenessException]:
-            with self.assertRaisesRegexp(exception, 'has already been used'):
+            with self.assertRaisesRegex(exception, 'has already been used'):
                 verifier.verify_jwt(a_jwt, self._example_aud)
 
     def assert_jwt_accepted_more_than_once(self, verifier, a_jwt):
@@ -180,8 +180,8 @@ def test_verify_jwt_subject_should_match_issuer(self):
         a_jwt = self._jwt_auth_signer.generate_jwt(
             self._example_aud,
             additional_claims={'sub': 'not-' + self._example_issuer})
-        with self.assertRaisesRegexp(ValueError,
-                                     'Issuer does not match the subject.'):
+        with self.assertRaisesRegex(ValueError,
+                                    'Issuer does not match the subject.'):
             verifier.verify_jwt(a_jwt, self._example_aud)
 
     def test_verify_jwt_subject_does_not_need_to_match_issuer(self):
@@ -204,7 +204,7 @@ def test_verify_jwt_with_missing_aud_claim(self, m_j_decode):
         m_j_decode.return_value = claims
         a_jwt = self._jwt_auth_signer.generate_jwt(self._example_aud)
         verifier = self._setup_jwt_auth_verifier(self._public_key_pem)
-        with self.assertRaisesRegexp(KeyError, expected_msg):
+        with self.assertRaisesRegex(KeyError, expected_msg):
             verifier.verify_jwt(a_jwt, self._example_aud)
 
     def test_verify_jwt_with_none_aud(self):

requirements.txt

@@ -2,4 +2,3 @@ cryptography>=3.2.1,<3.3.0
 PyJWT>=1.5.2,<2.0.0
 requests>=2.8.1,<3.0.0
 CacheControl==0.12.6
-backports.functools-lru-cache==1.6.1

setup.cfg

@@ -10,8 +10,6 @@ classifier =
         Intended Audience :: Developers
         Operating System :: OS Independent
         Programming Language :: Python
-        Programming Language :: Python :: 2
-        Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6