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

Merge branch 'master' of github.com:web2py/web2py

Browse Source
This commit is contained in:
mdipierro committed 2015-01-15 10:18:32 -06:00
2 parents c6cc06f6c0 0cfbab6206
commit 0aa58c5f93
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gluon/contrib/login_methods/browserid_account.py
+1 -1
View File
@@ -73,7 +73,7 @@ class BrowserID(object):
auth_info_json = fetch(self.verify_url, data=verify_data) auth_info_json = fetch(self.verify_url, data=verify_data)
j = json.loads(auth_info_json) j = json.loads(auth_info_json)
epoch_time = int(time.time() * 1000) # we need 13 digit epoch time epoch_time = int(time.time() * 1000) # we need 13 digit epoch time
if j["status"] == "okay" and j["audience"] == audience and j['issuer'] == issuer and j['expires'] >= epoch_time: if j["status"] == "okay" and j["audience"] == audience and j['issuer'].endswith(issuer) and j['expires'] >= epoch_time:
return dict(email=j['email']) return dict(email=j['email'])
elif self.on_login_failure: elif self.on_login_failure:
#print "status: ", j["status"]=="okay", j["status"] #print "status: ", j["status"]=="okay", j["status"]
gluon/dal/adapters/teradata.py
+1
View File
@@ -31,6 +31,7 @@ class TeradataAdapter(BaseAdapter):
'list:integer': 'VARCHAR(4000)', 'list:integer': 'VARCHAR(4000)',
'list:string': 'VARCHAR(4000)', 'list:string': 'VARCHAR(4000)',
'list:reference': 'VARCHAR(4000)', 'list:reference': 'VARCHAR(4000)',
'geometry': 'ST_GEOMETRY', # http://www.info.teradata.com/HTMLPubs/DB_TTU_14_00/index.html#page/Database_Management/B035_1094_111A/ch14.055.160.html
'big-id': 'BIGINT GENERATED ALWAYS AS IDENTITY', # Teradata Specific 'big-id': 'BIGINT GENERATED ALWAYS AS IDENTITY', # Teradata Specific
'big-reference': 'BIGINT', 'big-reference': 'BIGINT',
'reference FK': ' REFERENCES %(foreign_key)s', 'reference FK': ' REFERENCES %(foreign_key)s',