Created
August 12, 2012 18:15
-
-
Save claudep/3333535 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py | |
index 0880079..1302ca0 100644 | |
--- a/django/db/backends/sqlite3/base.py | |
+++ b/django/db/backends/sqlite3/base.py | |
@@ -11,6 +11,7 @@ import decimal | |
import warnings | |
import re | |
import sys | |
+from functools import partial | |
from django.db import utils | |
from django.db.backends import * | |
@@ -56,13 +57,23 @@ def adapt_datetime_with_timezone_support(value): | |
value = value.astimezone(timezone.utc).replace(tzinfo=None) | |
return value.isoformat(str(" ")) | |
-Database.register_converter(str("bool"), lambda s: str(s) == '1') | |
-Database.register_converter(str("time"), parse_time) | |
-Database.register_converter(str("date"), parse_date) | |
-Database.register_converter(str("datetime"), parse_datetime_with_timezone_support) | |
-Database.register_converter(str("timestamp"), parse_datetime_with_timezone_support) | |
-Database.register_converter(str("TIMESTAMP"), parse_datetime_with_timezone_support) | |
-Database.register_converter(str("decimal"), util.typecast_decimal) | |
+def decoder(conv_func): | |
+ """ The Python sqlite3 interface returns always byte strings. This | |
+ decorator transforms the received value to a regular string before | |
+ passing it to the receiver function. | |
+ """ | |
+ def inner(func, value): | |
+ return func(value.decode('utf-8')) | |
+ return partial(inner, conv_func) | |
+ | |
+Database.register_converter(str("bool"), decoder(lambda s: str(s) == '1')) | |
+Database.register_converter(str("time"), decoder(parse_time)) | |
+Database.register_converter(str("date"), decoder(parse_date)) | |
+Database.register_converter(str("datetime"), decoder(parse_datetime_with_timezone_support)) | |
+Database.register_converter(str("timestamp"), decoder(parse_datetime_with_timezone_support)) | |
+Database.register_converter(str("TIMESTAMP"), decoder(parse_datetime_with_timezone_support)) | |
+Database.register_converter(str("decimal"), decoder(util.typecast_decimal)) | |
+ | |
Database.register_adapter(datetime.datetime, adapt_datetime_with_timezone_support) | |
Database.register_adapter(decimal.Decimal, util.rev_typecast_decimal) | |
if Database.version_info >= (2, 4, 1): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment