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

fixed issue with lack of charset in driver, thanks Felipe Meirelles

Browse Source
This commit is contained in:
mdipierro
2012-12-27 14:27:18 -06:00
parent c8d4e03ead
commit e8a7c0257e
3 changed files with 4 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.2012.12.26.11.54.07 Version 2.4.1-alpha.2+timestamp.2012.12.27.14.26.35
gluon/contrib/markmin/markmin2html.py
+1 -2
View File
@@ -564,11 +564,10 @@ def replace_autolinks(text,autolinks):
def replace_at_urls(text,url): def replace_at_urls(text,url):
# this is experimental @{function/args} # this is experimental @{function/args}
# turns into a digitally signed URL
def u1(match,url=url): def u1(match,url=url):
a,c,f,args = match.group('a','c','f','args') a,c,f,args = match.group('a','c','f','args')
return url(a=a or None,c=c or None,f = f or None, 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) return regex_URL.sub(u1,text)
def replace_components(text,env): def replace_components(text,env):
gluon/dal.py
+2
View File
@@ -4098,6 +4098,8 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
instance = credential_decoder(m.group('instance')) instance = credential_decoder(m.group('instance'))
self.dbstring = db = credential_decoder(m.group('db')) self.dbstring = db = credential_decoder(m.group('db'))
driver_args['instance'] = instance driver_args['instance'] = instance
if not 'charset' in driver_args:
driver_args['charset'] = 'utf8'
self.createdb = createdb = adapter_args.get('createdb',True) self.createdb = createdb = adapter_args.get('createdb',True)
if not createdb: if not createdb:
driver_args['database'] = db driver_args['database'] = db