openstack/deb-python-pymysql
Code Issues Proposed changes

fixed a bug with encoding decimals and fixed a bug with respect to binary data and unicode

Browse Source
This commit is contained in:
Pete Hunt
2010-07-30 14:24:41 +00:00
parent 68056ad199
commit 830e4786c1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pymysql/converters.py
View File

@@ -51,8 +51,11 @@ def escape_float(value, charset):
def escape_string(value, charset): def escape_string(value, charset):
r = ("'%s'" % ESCAPE_REGEX.sub( r = ("'%s'" % ESCAPE_REGEX.sub(
lambda match: ESCAPE_MAP.get(match.group(0)), value)) lambda match: ESCAPE_MAP.get(match.group(0)), value))
if not charset is None: # TODO: make sure that encodings are handled correctly here.
r = r.encode(charset) # Since we may be dealing with binary data, the encoding
# routine below is commented out.
#if not charset is None:
# r = r.encode(charset)
return r return r
def escape_unicode(value, charset): def escape_unicode(value, charset):
@@ -296,8 +299,8 @@ try:
decoders[FIELD_TYPE.DECIMAL] = Decimal decoders[FIELD_TYPE.DECIMAL] = Decimal
decoders[FIELD_TYPE.NEWDECIMAL] = Decimal decoders[FIELD_TYPE.NEWDECIMAL] = Decimal
def escape_decimal(obj): def escape_decimal(obj, charset):
return str(obj) return unicode(obj).encode(charset)
encoders[Decimal] = escape_decimal encoders[Decimal] = escape_decimal
except ImportError: except ImportError: