changeset 46:4093fb968cb7 MySQLdb

Bring back conversions for the time being, until we can get trunk actually working right.
author kylev
date Tue, 17 Feb 2009 18:59:35 +0000
parents 28e9be1ca559
children c9c2c8bf1b8c
files MySQLdb/connections.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MySQLdb/connections.py	Tue Feb 17 06:24:44 2009 +0000
+++ b/MySQLdb/connections.py	Tue Feb 17 18:59:35 2009 +0000
@@ -130,7 +130,7 @@
         from MySQLdb.cursors import Cursor
         import _mysql
         from weakref import proxy
-        
+
         kwargs2 = kwargs.copy()
 
         if 'conv' in kwargs:
@@ -145,7 +145,8 @@
                     conv2[k] = v[:]
                 else:
                     conv2[k] = v
-        #kwargs2['conv'] = conv2
+        # TODO Remove this when we can do conversions in non-C space.
+        kwargs2['conv'] = conv2
 
         self.cursorclass = kwargs2.pop('cursorclass', Cursor)
         charset = kwargs2.pop('charset', '')