Reorder Jwt base class methods

codejudas · codejudas · commit a4111d5d7f1e · 2017-02-16T17:16:30.000-08:00
diff --git a/twilio/jwt/__init__.py b/twilio/jwt/__init__.py
@@ -62,6 +62,25 @@ def _generate_headers(self):
         """:rtype dict: Additional headers to include in the JWT, defaults to an empty dict"""
         return {}
 
+    @classmethod
+    def _from_jwt(cls, headers, payload, key=None):
+        """
+        Class specific implementation of from_jwt which should take jwt components and return
+        and instance of this Class with jwt information loaded.
+        :return: Jwt object containing the headers, payload and key
+        """
+        jwt = Jwt(
+            secret_key=key,
+            issuer=payload.get('iss', None),
+            subject=payload.get('sub', None),
+            algorithm=headers.get('alg', None),
+            valid_until=payload.get('exp', None),
+            nbf=payload.get('nbf', None),
+        )
+        jwt.__decoded_payload = payload
+        jwt.__decoded_headers = headers
+        return jwt
+
     @property
     def payload(self):
         if self.__decoded_payload:
@@ -110,25 +129,6 @@ def to_jwt(self, algorithm=None, ttl=None):
 
         return jwt_lib.encode(payload, self.secret_key, algorithm=algorithm, headers=headers)
 
-    @classmethod
-    def _from_jwt(cls, headers, payload, key=None):
-        """
-        Class specific implementation of from_jwt which should take jwt components and return
-        and instance of this Class with jwt information loaded.
-        :return: Jwt object containing the headers, payload and key
-        """
-        jwt = Jwt(
-            secret_key=key,
-            issuer=payload.get('iss', None),
-            subject=payload.get('sub', None),
-            algorithm=headers.get('alg', None),
-            valid_until=payload.get('exp', None),
-            nbf=payload.get('nbf', None),
-        )
-        jwt.__decoded_payload = payload
-        jwt.__decoded_headers = headers
-        return jwt
-
     @classmethod
     def from_jwt(cls, jwt, key=''):
         """
