From 65e9cc21272be26f258707dd9c3ff8e7ef075e9f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 15 May 2013 21:35:17 -0500 Subject: [PATCH] alternative escaping of password in DAL uri --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 6c7253d8..11dcfe19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.15.12.39.42 +Version 2.4.6-stable+timestamp.2013.05.15.21.34.19 diff --git a/gluon/dal.py b/gluon/dal.py index 6a088f68..195d1842 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -266,7 +266,7 @@ REGEX_STORE_PATTERN = re.compile('\.(?P\w{1,5})$') REGEX_QUOTES = re.compile("'[^']*'") REGEX_ALPHANUMERIC = re.compile('^[0-9a-zA-Z]\w*$') REGEX_PASSWORD = re.compile('\://([^:@]*)\:') -REGEX_NOPASSWD = re.compile('(?<=\:)([^:@/]+)(?=@.+)') +REGEX_NOPASSWD = re.compile('\/\/[\w\.\-]+[\:\/](.+)(?=@)') # was '(?<=[\:\/])([^:@/]+)(?=@.+)' # list of drivers will be built on the fly # and lists only what is available