dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oauth1 timeout. pbkdf2_ctypes repository reference in docstring

Browse Source
This commit is contained in:
Michele Comitini
2013-07-30 23:32:47 +02:00
parent 487cfc1cf7
commit 8fb1a954ba
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/login_methods/oauth10a_account.py
+3 -2
View File
@@ -109,7 +109,7 @@ class OAuthAccount(object):
self.session.access_token = None self.session.access_token = None
return None return None
def __init__(self, g, client_id, client_secret, auth_url, token_url, access_token_url): def __init__(self, g, client_id, client_secret, auth_url, token_url, access_token_url, socket_timeout=60):
self.globals = g self.globals = g
self.client_id = client_id self.client_id = client_id
self.client_secret = client_secret self.client_secret = client_secret
@@ -119,6 +119,7 @@ class OAuthAccount(object):
self.auth_url = auth_url self.auth_url = auth_url
self.token_url = token_url self.token_url = token_url
self.access_token_url = access_token_url self.access_token_url = access_token_url
self.socket_timeout = socket_timeout
# consumer init # consumer init
self.consumer = oauth.Consumer(self.client_id, self.client_secret) self.consumer = oauth.Consumer(self.client_id, self.client_secret)
@@ -154,7 +155,7 @@ class OAuthAccount(object):
if not self.accessToken(): if not self.accessToken():
# setup the client # setup the client
client = oauth.Client(self.consumer, None) client = oauth.Client(self.consumer, None, timeout=self.socket_timeout)
# Get a request token. # Get a request token.
# oauth_callback *is REQUIRED* for OAuth1.0a # oauth_callback *is REQUIRED* for OAuth1.0a
# putting it in the body seems to work. # putting it in the body seems to work.
gluon/contrib/pbkdf2_ctypes.py
+3 -1
View File
@@ -9,6 +9,8 @@
Note: This module is intended as a plugin replacement of pbkdf2.py Note: This module is intended as a plugin replacement of pbkdf2.py
by Armin Ronacher. by Armin Ronacher.
Git repository:
$ git clone https://github.com/michele-comitini/pbkdf2_ctypes.git
:copyright: Copyright (c) 2013: Michele Comitini <mcm@glisco.it> :copyright: Copyright (c) 2013: Michele Comitini <mcm@glisco.it>
:license: LGPLv3 :license: LGPLv3
@@ -42,7 +44,7 @@ try: # check that we have proper OpenSSL on the system.
hashlib.sha224: crypto.EVP_sha224, hashlib.sha224: crypto.EVP_sha224,
hashlib.sha384: crypto.EVP_sha384, hashlib.sha384: crypto.EVP_sha384,
hashlib.sha512: crypto.EVP_sha512} hashlib.sha512: crypto.EVP_sha512}
except OSError, AttributeError: except (OSError, AttributeError), e:
raise ImportError('Cannot find a compatible OpenSSL installation ' raise ImportError('Cannot find a compatible OpenSSL installation '
'on your system') 'on your system')