diff MySQLdb/converters.py @ 4:b5a377255eea MySQLdb

Merge changes from MySQLdb-1.2 branch (448-455)
author adustman
date Tue, 24 Oct 2006 19:52:31 +0000
parents e48810735f11
children b70cce9bd065
line wrap: on
line diff
--- a/MySQLdb/converters.py	Sun Apr 09 04:06:40 2006 +0000
+++ b/MySQLdb/converters.py	Tue Oct 24 19:52:31 2006 +0000
@@ -143,17 +143,18 @@
     FIELD_TYPE.TIME: TimeDelta_or_None,
     FIELD_TYPE.DATE: Date_or_None,
     FIELD_TYPE.BLOB: [
-        (FLAG.BINARY, char_array),
-        (None, None),
-    ],
+        (FLAG.BINARY, str),
+        ],
     FIELD_TYPE.STRING: [
+        (FLAG.BINARY, str),
         (FLAG.SET, Str2Set),
-        (None, None),
-    ],
+        ],
     FIELD_TYPE.VAR_STRING: [
-        (FLAG.SET, Str2Set),
-        (None, None),
-    ],
+        (FLAG.BINARY, str),
+        ],
+    FIELD_TYPE.VARCHAR: [
+        (FLAG.BINARY, str),
+        ],
     }
 
 try: