fixed issue with lack of charset in driver, thanks Felipe Meirelles
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user