From 6411045b622573dd79b365dc360da887d98867f4 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Mon, 28 May 2012 12:29:19 -0500 Subject: [PATCH] dal connection strigs now allo / in hostnames, thanks Babak --- VERSION | 2 +- gluon/dal.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 43bb2f25..a01f8e0a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-27 17:51:38) dev +Version 2.00.0 (2012-05-28 12:28:07) dev diff --git a/gluon/dal.py b/gluon/dal.py index d4378eb9..4e9fa214 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2173,7 +2173,7 @@ class PostgreSQLAdapter(BaseAdapter): self.srid = srid self.find_or_make_work_folder() library, uri = uri.split('://')[:2] - m = re.compile('^(?P[^:@]+)(\:(?P[^@]*))?@(?P[^\:@/]+)(\:(?P[0-9]+))?/(?P[^\?]+)(\?sslmode=(?P.+))?$').match(uri) + m = re.compile('^(?P[^:@]+)(\:(?P[^@]*))?@(?P[^\:@]+)(\:(?P[0-9]+))?/(?P[^\?]+)(\?sslmode=(?P.+))?$').match(uri) if not m: raise SyntaxError, "Invalid URI string in DAL" user = credential_decoder(m.group('user')) @@ -3490,7 +3490,7 @@ class SAPDBAdapter(BaseAdapter): self.db_codec = db_codec self.find_or_make_work_folder() uri = uri.split('://')[1] - m = re.compile('^(?P[^:@]+)(\:(?P[^@]*))?@(?P[^\:@/]+)(\:(?P[0-9]+))?/(?P[^\?]+)(\?sslmode=(?P.+))?$').match(uri) + m = re.compile('^(?P[^:@]+)(\:(?P[^@]*))?@(?P[^\:@]+)(\:(?P[0-9]+))?/(?P[^\?]+)(\?sslmode=(?P.+))?$').match(uri) if not m: raise SyntaxError, "Invalid URI string in DAL" user = credential_decoder(m.group('user')) @@ -5142,7 +5142,7 @@ class IMAPAdapter(NoSQLAdapter): db['_lastsql'] = '' - m = re.compile('^(?P[^:]+)(\:(?P[^@]*))?@(?P[^\:@/]+)(\:(?P[0-9]+))?$').match(uri) + m = re.compile('^(?P[^:]+)(\:(?P[^@]*))?@(?P[^\:@]+)(\:(?P[0-9]+))?$').match(uri) user = m.group('user') password = m.group('password') host = m.group('host')