Merge pull request twilio#242 from twilio/remote-pyjwt

jingming · jingming · commit fbeb37398a24 · 2015-12-11T16:44:50.000-08:00
Remove pyjwt
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 six
 httplib2
 socksipy-branch
-pyjwt
diff --git a/twilio/access_token.py b/twilio/access_token.py
@@ -1,5 +1,5 @@
 import time
-import jwt
+from twilio import jwt
 
 
 class IpMessagingGrant(object):
@@ -91,4 +91,4 @@ def to_jwt(self, algorithm='HS256'):
                           algorithm=algorithm)
 
     def __str__(self):
-        return self.to_jwt().decode('utf-8')
+        return self.to_jwt()

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 six
 httplib2
 socksipy-branch
 -pyjwt