summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-08-29 08:35:17 +0200
committerClaude Paroz <claude@2xlibre.net>2013-08-29 08:43:35 +0200
commit58157be5ad31b42a1dc73e357cfdece02fd0b6ee (patch)
treecf8862ae3fe8731717c4bf0ba5556de37a627c32
parent68eca2b36ff8e4091fbfd210ca0782c7b8313a05 (diff)
[1.6.x] Fixed #20984 -- Stopped decoding bytes in sqlite3 adapter on Python 3
Thanks lvella at gmail.com for the report. Backport of 169637649 from master.
-rw-r--r--django/db/backends/sqlite3/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 92dbf354ae..3a0a9f57b7 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -78,7 +78,7 @@ 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):
+if not six.PY3 and Database.version_info >= (2, 4, 1):
# Starting in 2.4.1, the str type is not accepted anymore, therefore,
# we convert all str objects to Unicode
# As registering a adapter for a primitive type causes a small