summaryrefslogtreecommitdiff
path: root/django/db/backends/sqlite3
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-12-16 14:28:22 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-12-16 14:28:22 +0000
commit5f78eff9095e5563fe287910e91ffd8267e03ef3 (patch)
treea8eeaa5ad67204cc20a457e9b4c90036cc6d3328 /django/db/backends/sqlite3
parentb58a260c56c5d05d71ac1073bc05eda8eca0ea5f (diff)
Fixed #9814 -- Allowed SafeStrings to be saved to sqlite DB when running on Python 2.6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/backends/sqlite3')
-rw-r--r--django/db/backends/sqlite3/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index 745f9982a0..15b0e983ad 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -10,6 +10,7 @@ from django.db.backends import *
from django.db.backends.sqlite3.client import DatabaseClient
from django.db.backends.sqlite3.creation import DatabaseCreation
from django.db.backends.sqlite3.introspection import DatabaseIntrospection
+from django.utils.safestring import SafeString
try:
try:
@@ -49,6 +50,7 @@ if Database.version_info >= (2,4,1):
# slow-down, this adapter is only registered for sqlite3 versions
# needing it.
Database.register_adapter(str, lambda s:s.decode('utf-8'))
+ Database.register_adapter(SafeString, lambda s:s.decode('utf-8'))
class DatabaseFeatures(BaseDatabaseFeatures):
# SQLite cannot handle us only partially reading from a cursor's result set