From e8a7c0257ec70d921acaa0b7a11f577a28b81f4a Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 27 Dec 2012 14:27:18 -0600 Subject: [PATCH] fixed issue with lack of charset in driver, thanks Felipe Meirelles --- VERSION | 2 +- gluon/contrib/markmin/markmin2html.py | 3 +-- gluon/dal.py | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 8a735101..f78ed260 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2012.12.26.11.54.07 +Version 2.4.1-alpha.2+timestamp.2012.12.27.14.26.35 diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 06e3d862..0f56b603 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -564,11 +564,10 @@ def replace_autolinks(text,autolinks): def replace_at_urls(text,url): # this is experimental @{function/args} - # turns into a digitally signed URL def u1(match,url=url): a,c,f,args = match.group('a','c','f','args') return url(a=a or None,c=c or None,f = f or None, - args=args.split('/'), scheme=True, host=True) + args=(args or '').split('/'), scheme=True, host=True) return regex_URL.sub(u1,text) def replace_components(text,env): diff --git a/gluon/dal.py b/gluon/dal.py index 3119a051..b4df67e9 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4098,6 +4098,8 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): instance = credential_decoder(m.group('instance')) self.dbstring = db = credential_decoder(m.group('db')) driver_args['instance'] = instance + if not 'charset' in driver_args: + driver_args['charset'] = 'utf8' self.createdb = createdb = adapter_args.get('createdb',True) if not createdb: driver_args['database'] = db