* make sure charset has a default (None)

* eliminate lambda usage
This commit is contained in:
adustman
2005-01-17 01:51:00 +00:00
parent 249ab4d23e
commit 8900d410ae

View File

@ -92,6 +92,7 @@ class Connection(_mysql.connection):
del kwargs2['cursorclass'] del kwargs2['cursorclass']
else: else:
self.cursorclass = self.default_cursor self.cursorclass = self.default_cursor
self.charset = None
if kwargs.has_key('unicode'): if kwargs.has_key('unicode'):
charset = kwargs['unicode'] charset = kwargs['unicode']
errors = kwargs.get('unicode_errors', 'strict') errors = kwargs.get('unicode_errors', 'strict')
@ -100,7 +101,7 @@ class Connection(_mysql.connection):
del kwargs2['unicode_errors'] del kwargs2['unicode_errors']
if charset: if charset:
self.charset = charset self.charset = charset
u = lambda s, c=charset, e=errors: unicode(s, c, e) def u(s, c=charset, e=errors): return unicode(s, c, e)
else: else:
u = unicode u = unicode
conv[FIELD_TYPE.STRING] = u conv[FIELD_TYPE.STRING] = u