Changeset 74

User picture

Author: dkeeney

(2010/12/03 04:08) Over 1 year ago

tweak to charset management

Affected files

Updated ORMs/SqlObject/sqlobject-0.13d/sqlobject/rdbhost/rdbconnection.py Download diff

7374
22
                 user=None, password=None, backend='rdbhost', unicodeCols=False,
22
                 user=None, password=None, backend='rdbhost', unicodeCols=False,
23
                 **kw):
23
                 **kw):
24
        backends = backend
24
        backends = backend
 
25
        if 'charset' not in kw:



26
            kw['charset'] = 'utf8'



27
        for backend in backends.split(','):
25
        for backend in backends.split(','):



28
            backend = backend.strip()
26
            backend = backend.strip()



29
            if not backend:
27
            if not backend:


...
...
77
        self.dsn = dsn
75
        self.dsn = dsn



78
        self.unicodeCols = unicodeCols
76
        self.unicodeCols = unicodeCols



79
        self.schema = kw.pop('schema', None)
77
        self.schema = kw.pop('schema', None)



80
        if "charset" in kw:
78
        self.dbEncoding = 'UTF8'



81
            self.dbEncoding = kw.pop("charset")



82
        else:



83
            self.dbEncoding = None



84
        DBAPI.__init__(self, **kw)
79
        DBAPI.__init__(self, **kw)