Merge pull request twilio#40 from twilio/remove-pyjwt

jingming · jingming · commit 32211d6969ce · 2015-12-11T16:29:22.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/setup.py b/setup.py
@@ -13,7 +13,7 @@
 #
 # You need to have the setuptools module installed. Try reading the setuptools
 # documentation: http://pypi.python.org/pypi/setuptools
-REQUIRES = ["httplib2 >= 0.7", "six", "pytz", "pyjwt"]
+REQUIRES = ["httplib2 >= 0.7", "six", "pytz"]
 
 if sys.version_info < (2, 6):
     REQUIRES.append('simplejson')
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
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#`
`14`	`14`	`# You need to have the setuptools module installed. Try reading the setuptools`
`15`	`15`	`# documentation: http://pypi.python.org/pypi/setuptools`
`16`		`-REQUIRES = ["httplib2 >= 0.7", "six", "pytz", "pyjwt"]`
	`16`	`+REQUIRES = ["httplib2 >= 0.7", "six", "pytz"]`
`17`	`17`
`18`	`18`	`if sys.version_info < (2, 6):`
`19`	`19`	`REQUIRES.append('simplejson')`