← Back to branch summary

~vcs-imports/python-mysqldb/old-svn-trunk

« back to all changes in this revision

Viewing changes to MySQLdb/converters.py

  • Committer: adustman
  • Date: 2009-03-29 16:26:30 UTC
  • Revision ID: vcs-imports@canonical.com-20090329162630-idfg4s5m5csia5iu
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MySQLdb/converters.py
44
44
import datetime
45
45
from decimal import Decimal
46
46
 
47
 
__revision__ = "$Revision: 621 $"[11:-2]
 
47
__revision__ = "$Revision: 623 $"[11:-2]
48
48
__author__ = "$Author: adustman $"[9:-2]
49
49
 
50
50
def bool_to_sql(boolean, conv):
163
163
    _filter_NULL.__name__ = f.__name__
164
164
    return _filter_NULL
165
165
 
166
 
def default_decoder(cursor, field):
 
166
def default_decoder(field):
167
167
    return str
168
168
 
169
 
def simple_decoder(cursor, field):
 
169
def simple_decoder(field):
170
170
    return simple_field_decoders.get(field.type, None)
171
171
 
172
172
character_types = [
176
176
    FIELD_TYPE.VARCHAR,
177
177
    ]
178
178
 
179
 
def character_decoder(cursor, field):
 
179
def character_decoder(field):
180
180
    if field.type not in character_types:
181
181
        return None
182
182
    if field.charsetnr == 63: # BINARY
183
183
        return str
184
184
    
185
 
    charset = cursor.connection.character_set_name()
 
185
    charset = field.result.connection.character_set_name()
186
186
    def char_to_unicode(s):
187
187
        return s.decode(charset)
188
188