fix!: update code and tests for pyjwt>=2.0.0

.deepsource.toml

@@ -2,14 +2,11 @@ version = 1
 
 exclude_patterns = [
   'examples/**',
-  
+
   # auto-generated files
   'twilio/rest/**',
   'twilio/twiml/**',
   'tests/integration/**',
-
-  # compat files
-  'twilio/compat.py',
 ]
 
 test_patterns = [

.travis.yml

@@ -1,12 +1,10 @@
 dist: xenial # required for Python >= 3.7
 language: python
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 services:
   - docker
 install:

Makefile

@@ -1,7 +1,7 @@
 .PHONY: clean install analysis test test-install develop docs docs-install
 
 venv:
-	@python --version || (echo "Python is not installed, please install Python 2 or Python 3"; exit 1);
+	@python --version || (echo "Python is not installed, Python 3.6+"; exit 1);
 	virtualenv --python=python venv
 
 install: venv

README.md

@@ -25,12 +25,10 @@ Please consult the [official migration guide](https://www.twilio.com/docs/librar
 
 This library supports the following Python implementations:
 
-* Python 2.7
-* Python 3.4
-* Python 3.5
 * Python 3.6
 * Python 3.7
 * Python 3.8
+* Python 3.9
 
 ## Installation
 

requirements.txt

@@ -1,7 +1,6 @@
 flake8
 mock
 nose
-six
 requests>=2.0.0
-PyJWT==1.7.1
-twine
+PyJWT>=2.0.0, <3.0.0
+twine

setup.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 from setuptools import setup, find_packages
 
 __version__ = None
@@ -24,19 +23,12 @@
     author_email="help@twilio.com",
     url="https://github.com/twilio/twilio-python/",
     keywords=["twilio", "twiml"],
+    python_requires='>=3.6.0',
     install_requires=[
-        "six",
         "pytz",
-        "PyJWT == 1.7.1",
+        "requests >= 2.0.0",
+        "PyJWT >= 2.0.0, < 3.0.0",
     ],
-    extras_require={
-        ':python_version<"3.0"': [
-            "requests[security] >= 2.0.0",
-        ],
-        ':python_version>="3.0"': [
-            "requests >= 2.0.0"
-        ],
-    },
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     classifiers=[
@@ -45,12 +37,10 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Communications :: Telephony",

tests/unit/jwt/test_jwt.py

@@ -43,7 +43,7 @@ def assertJwtsEqual(self, jwt, key, expected_payload=None, expected_headers=None
         expected_headers = expected_headers or {}
         expected_payload = expected_payload or {}
 
-        decoded_payload = jwt_lib.decode(jwt, key, verify=False)
+        decoded_payload = jwt_lib.decode(jwt, key, algorithms=["HS256"], options={"verify_signature": False})
         decoded_headers = jwt_lib.get_unverified_header(jwt)
 
         self.assertEqual(expected_headers, decoded_headers)
@@ -242,9 +242,8 @@ def test_decode_bad_secret(self):
 
     def test_decode_modified_jwt_fails(self):
         jwt = DummyJwt('secret_key', 'issuer')
-        example_jwt = jwt.to_jwt().decode('utf-8')
+        example_jwt = jwt.to_jwt()
         example_jwt = 'ABC' + example_jwt[3:]
-        example_jwt = example_jwt.encode('utf-8')
 
         self.assertRaises(JwtDecodeError, Jwt.from_jwt, example_jwt, 'secret_key')
 

tests/unit/test_request_validator.py

@@ -2,7 +2,6 @@
 import unittest
 
 from nose.tools import assert_equal, assert_true
-from six import b, u
 
 from twilio.request_validator import RequestValidator
 
@@ -26,22 +25,13 @@ def setUp(self):
         self.bodyHash = "0a1ff7634d9ab3b95db5c9a2dfe9416e41502b283a80c7cf19632632f96e6620"
         self.uriWithBody = self.uri + "&bodySHA256=" + self.bodyHash
 
-    def test_compute_signature_bytecode(self):
-        expected = b(self.expected)
-        signature = self.validator.compute_signature(self.uri,
-                                                     self.params,
-                                                     utf=False)
-        assert_equal(signature, expected)
-
     def test_compute_signature(self):
         expected = (self.expected)
-        signature = self.validator.compute_signature(self.uri,
-                                                     self.params,
-                                                     utf=True)
+        signature = self.validator.compute_signature(self.uri, self.params)
         assert_equal(signature, expected)
 
     def test_compute_hash_unicode(self):
-        expected = u(self.bodyHash)
+        expected = self.bodyHash
         body_hash = self.validator.compute_hash(self.body)
 
         assert_equal(expected, body_hash)

tests/unit/twiml/__init__.py

@@ -1,7 +1,6 @@
 import unittest
 
 from nose.tools import raises
-from six import text_type
 
 from twilio.twiml import (
     format_language,
@@ -13,7 +12,7 @@
 
 class TwilioTest(unittest.TestCase):
     def strip(self, xml):
-        return text_type(xml)
+        return str(xml)
 
     @raises(TwiMLException)
     def test_append_fail(self):

tests/unit/twiml/test_voice_response.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from nose.tools import assert_equal
-from six import u
 from tests.unit.twiml import TwilioTest
 from twilio.twiml.voice_response import VoiceResponse, Dial, Enqueue, Gather
 
@@ -82,7 +81,7 @@ def test_say_hello_world(self):
     def test_say_french(self):
         """ should say hello monkey """
         r = VoiceResponse()
-        r.say(u('n\xe9cessaire et d\'autres'))
+        r.say('n\xe9cessaire et d\'autres')
 
         assert_equal(
             self.strip(r),

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py3{4,5,6,7,8}, pypy
+envlist = py3{6,7,8}, pypy
 skip_missing_interpreters = true
 
 [testenv]

twilio/base/exceptions.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import sys
 
-from six import u
-
 
 class TwilioException(Exception):
     pass
@@ -32,16 +30,16 @@ def __str__(self):
         """ Try to pretty-print the exception, if this is going on screen. """
 
         def red(words):
-            return u("\033[31m\033[49m%s\033[0m") % words
+            return "\033[31m\033[49m%s\033[0m" % words
 
         def white(words):
-            return u("\033[37m\033[49m%s\033[0m") % words
+            return "\033[37m\033[49m%s\033[0m" % words
 
         def blue(words):
-            return u("\033[34m\033[49m%s\033[0m") % words
+            return "\033[34m\033[49m%s\033[0m" % words
 
         def teal(words):
-            return u("\033[36m\033[49m%s\033[0m") % words
+            return "\033[36m\033[49m%s\033[0m" % words
 
         def get_uri(code):
             return "https://www.twilio.com/docs/errors/{0}".format(code)

twilio/base/values.py

@@ -1,4 +1,3 @@
-from six import iteritems
 unset = object()
 
 
@@ -9,4 +8,4 @@ def of(d):
     :param dict d: A dict to strip.
     :return dict: A dict with unset values removed.
     """
-    return {k: v for k, v in iteritems(d) if v != unset}
+    return {k: v for k, v in d.items() if v != unset}

twilio/http/http_client.py

@@ -2,7 +2,7 @@
 
 from requests import Request, Session, hooks
 from requests.adapters import HTTPAdapter
-from twilio.compat import urlencode
+from urllib.parse import urlencode
 from twilio.http import HttpClient
 from twilio.http.request import Request as TwilioRequest
 from twilio.http.response import Response

twilio/http/request.py

@@ -1,4 +1,4 @@
-from twilio.compat import urlencode
+from urllib.parse import urlencode
 
 
 class Request(object):

twilio/http/validation_client.py

@@ -3,7 +3,7 @@
 from requests import Request, Session
 
 from twilio.base.exceptions import TwilioRestException
-from twilio.compat import urlparse
+from urllib.parse import urlparse
 from twilio.http import HttpClient
 from twilio.http.response import Response
 from twilio.jwt.validation import ClientValidationJwt

twilio/jwt/__init__.py

@@ -1,12 +1,6 @@
 import hmac
 import sys
 
-from twilio.jwt import compat
-
-if sys.version_info[0] == 3 and sys.version_info[1] == 2:
-    # PyJWT expects hmac.compare_digest to exist even under python 3.2
-    hmac.compare_digest = compat.compare_digest
-
 import jwt as jwt_lib
 
 try:
@@ -140,7 +134,8 @@ def from_jwt(cls, jwt, key=''):
         verify = True if key else False
 
         try:
-            payload = jwt_lib.decode(bytes(jwt), key, options={
+            alg = jwt_lib.get_unverified_header(jwt).get("alg", "HS256")
+            payload = jwt_lib.decode(jwt, key, algorithms=[alg], options={
                 'verify_signature': verify,
                 'verify_exp': True,
                 'verify_nbf': True,

twilio/jwt/client/__init__.py

@@ -1,7 +1,6 @@
 from twilio.jwt import Jwt
 
-from six import iteritems
-from twilio.compat import urlencode
+from urllib.parse import urlencode
 
 
 class ClientCapabilityToken(Jwt):
@@ -94,7 +93,7 @@ def add_param(self, key, value):
 
     def to_payload(self):
         if self.params:
-            sorted_params = sorted([(k, v) for k, v in iteritems(self.params)])
+            sorted_params = sorted([(k, v) for k, v in self.params.items()])
             encoded_params = urlencode(sorted_params)
             param_string = '?{}'.format(encoded_params)
         else:

twilio/jwt/validation/__init__.py

@@ -1,5 +1,4 @@
 from hashlib import sha256
-from six import string_types
 
 from twilio.jwt import Jwt
 
@@ -73,7 +72,7 @@ def _generate_payload(self):
 
     @classmethod
     def _sort_and_join(cls, values, joiner):
-        if isinstance(values, string_types):
+        if isinstance(values, str):
             return values
         return joiner.join(sorted(values))