Mercurial > p > mysql-python > mysqldb-2

diff MySQLdb/converters.py @ 66:5a7c30cd9de2 MySQLdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
By exposing connection on result, decoders can be simplified: Only the field object is needed. Turned on leak testing and found a leak writing BLOBs. removed one of the old stubs in Cursor.
author adustman
date Sun, 29 Mar 2009 16:26:30 +0000
parents 2d6a35051f64
children 98d968f5af11
line wrap: on
line diff
--- a/MySQLdb/converters.py	Sun Mar 29 00:52:14 2009 +0000
+++ b/MySQLdb/converters.py	Sun Mar 29 16:26:30 2009 +0000
@@ -163,10 +163,10 @@
     _filter_NULL.__name__ = f.__name__
     return _filter_NULL
 
-def default_decoder(cursor, field):
+def default_decoder(field):
     return str
 
-def simple_decoder(cursor, field):
+def simple_decoder(field):
     return simple_field_decoders.get(field.type, None)
 
 character_types = [
@@ -176,13 +176,13 @@
     FIELD_TYPE.VARCHAR,
     ]
 
-def character_decoder(cursor, field):
+def character_decoder(field):
     if field.type not in character_types:
         return None
     if field.charsetnr == 63: # BINARY
         return str
     
-    charset = cursor.connection.character_set_name()
+    charset = field.result.connection.character_set_name()
     def char_to_unicode(s):
         return s.decode(charset)