Muix2015
diff --git a/‎twilio/jwt/__init__.py
Lines changed: 24 additions & 24 deletions b/‎twilio/jwt/__init__.py
Lines changed: 24 additions & 24 deletions
diff --git a/‎twilio/jwt/compat.py
Lines changed: 8 additions & 8 deletions b/‎twilio/jwt/compat.py
Lines changed: 8 additions & 8 deletions
@@ -77,38 +77,38 @@ def _from_jwt(cls, headers, payload, key=None):
     def payload(self):
         if self.__decoded_payload:
             return self.__decoded_payload
-        else:
-            payload = self._generate_payload().copy()
-            payload['iss'] = self.issuer
-            payload['nbf'] = self.nbf or int(time.time())
-            payload['exp'] = int(time.time()) + self.ttl
-            if self.valid_until:
-                payload['exp'] = self.valid_until
-            if self.subject:
-                payload['sub'] = self.subject
-
-            return payload
+
+        payload = self._generate_payload().copy()
+        payload['iss'] = self.issuer
+        payload['nbf'] = self.nbf or int(time.time())
+        payload['exp'] = int(time.time()) + self.ttl
+        if self.valid_until:
+            payload['exp'] = self.valid_until
+        if self.subject:
+            payload['sub'] = self.subject
+
+        return payload
 
     @property
     def headers(self):
         if self.__decoded_headers:
             return self.__decoded_headers
-        else:
-            headers = self._generate_headers().copy()
-            headers['typ'] = 'JWT'
-            headers['alg'] = self.algorithm
-            return headers
+
+        headers = self._generate_headers().copy()
+        headers['typ'] = 'JWT'
+        headers['alg'] = self.algorithm
+        return headers
 
     def to_jwt(self, algorithm=None, ttl=None):
         """
-        Encode this Jwt object into a Jwt string
-        :param str algorithm: override the algorithm used to encode the jwt
+        Encode this JWT object into a JWT string
+        :param str algorithm: override the algorithm used to encode the JWT
         :param int ttl: override the ttl configured in the constructor
-        :rtype: str The Jwt string
+        :rtype: str The JWT string
         """
 
         if not self.secret_key:
-            raise ValueError('Jwt does not have a signing key configured.')
+            raise ValueError('JWT does not have a signing key configured.')
 
         headers = self.headers.copy()
         if algorithm:
@@ -124,11 +124,11 @@ def to_jwt(self, algorithm=None, ttl=None):
     @classmethod
     def from_jwt(cls, jwt, key=''):
         """
-        Decode a Jwt string into a Jwt object
-        :param str jwt: jwt string
-        :param Optional[str] key: key used to verify jwt signature, if not provided then validation
+        Decode a JWT string into a Jwt object
+        :param str jwt: JWT string
+        :param Optional[str] key: key used to verify JWT signature, if not provided then validation
                                   is skipped.
-        :raises JwtDecodeError if decoding jwt fails for any reason.
+        :raises JwtDecodeError if decoding JWT fails for any reason.
         :return: A DecodedJwt object containing the jwt information.
         """
         verify = True if key else False
 
@@ -1,12 +1,12 @@
-
-
-#
-# PyJWT expects hmac.compare_digest to exist for all Python 3.x, however it was added in Python > 3.3
-# Copied from: https://github.com/python/cpython/commit/6cea65555caf2716b4633827715004ab0291a282#diff-c49659257ec1b129707ce47a98adc96eL16
-#
 def compare_digest(a, b):
-    """Returns the equivalent of 'a == b', but avoids content based short
-    circuiting to reduce the vulnerability to timing attacks."""
+    """
+    PyJWT expects hmac.compare_digest to exist for all Python 3.x, however it was added in Python > 3.3
+    It has a fallback for Python 2.x but not for Pythons between 2.x and 3.3
+    Copied from: https://github.com/python/cpython/commit/6cea65555caf2716b4633827715004ab0291a282#diff-c49659257ec1b129707ce47a98adc96eL16
+
+    Returns the equivalent of 'a == b', but avoids content based short
+    circuiting to reduce the vulnerability to timing attacks.
+    """
     # Consistent timing matters more here than data type flexibility
     if not (isinstance(a, bytes) and isinstance(b, bytes)):
         raise TypeError("inputs must be bytes instances")