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

fixed issue with hiding password, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2013-01-11 09:02:22 -06:00
parent ea07c9dcd8
commit 96f4c944c1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.01.10.23.15.01 Version 2.4.1-alpha.2+timestamp.2013.01.11.09.01.31
gluon/dal.py
+2 -2
View File
@@ -447,7 +447,7 @@ def pluralize(singular, rules=PLURALIZE_RULES):
if plural: return plural if plural: return plural
def hide_password(uri): def hide_password(uri):
return REGEX_PASSWORD.sub('://******:',uri) return REGEX_NOPASSWD.sub('******',uri)
def OR(a,b): def OR(a,b):
return a|b return a|b
@@ -6884,7 +6884,7 @@ class DAL(object):
for db in db_group: for db in db_group:
if not db._uri: if not db._uri:
continue continue
k = REGEX_NOPASSWD.sub('******',db._uri) k = hide_password(db._uri)
infos[k] = dict(dbstats = [(row[0], row[1]) for row in db._timings], infos[k] = dict(dbstats = [(row[0], row[1]) for row in db._timings],
dbtables = {'defined': dbtables = {'defined':
sorted(list(set(db.tables) - sorted(list(set(db.tables) -