@@ -61,7 +61,6 @@ def fetch_token(self, oauth_request):
6161 return oauth .OAuthToken .from_string (response .read ())
6262
6363 def urlopen (self , url , user = None , * args , ** kwargs ):
64- # print "\n%s\n" % url
6564 try :
6665 response = urllib2 .urlopen (url )
6766 except urllib2 .HTTPError , why :
@@ -78,7 +77,7 @@ def urlopen(self, url, user=None, *args, **kwargs):
7877 return response
7978
8079 def refresh (self , user ):
81- if type (user ) != self .db .User : user = self .db .User .get (user )
80+ if not isinstance (user , self .db .User ) : user = self .db .User .get (user )
8281
8382 access_token = user .get_access_token ()
8483 request = oauth .OAuthRequest .from_consumer_and_token (
@@ -99,16 +98,17 @@ def start(self):
9998 )
10099 oauth_request .sign_request (self .signature_method_hmac_sha1 , self .consumer , None )
101100 token = self .fetch_token (oauth_request )
102- oauth_request = oauth .OAuthRequest .from_token_and_callback (token = token , http_url = self .authorization_url )
103101
104102 user = self .db .User (type = self .type )
105103 user .set_request_token (token )
106104 user .save ()
105+
106+ oauth_request = oauth .OAuthRequest .from_token_and_callback (token = token , http_url = self .authorization_url )
107107 return user , oauth_request .to_url ()
108108
109109
110- def verify (self , user , token , verifier ):
111- if type (user ) != self .db .User : user = self .db .User .get (user )
110+ def verify (self , user , token , verifier = None ):
111+ if not isinstance (user , self .db .User ) : user = self .db .User .get (user )
112112
113113 request_token = user .get_request_token ()
114114 assert token == request_token .key
@@ -124,7 +124,7 @@ def verify(self, user, token, verifier):
124124
125125
126126 def fetch (self , url , user , * args , ** kwargs ):
127- if type (user ) != self .db .User : user = self .db .User .get (user )
127+ if not isinstance (user , self .db .User ) : user = self .db .User .get (user )
128128
129129 access_token = user .get_access_token ()
130130 request = oauth .OAuthRequest .from_consumer_and_token (
0 commit comments