Author: kmtracey
Date: 2008-12-16 08:34:12 -0600 (Tue, 16 Dec 2008)
New Revision: 9655
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/django/db/backends/sqlite3/base.py
Log:
[1.0.X] Fixed #9814 -- Allowed SafeStrings to be saved to sqlite DB when
running on Python 2.6.
r9654 from trunk, also updated merge metadata to reflect that all other bugfix
changetsets have been merged.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9639
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9654
Modified: django/branches/releases/1.0.X/django/db/backends/sqlite3/base.py
===================================================================
--- django/branches/releases/1.0.X/django/db/backends/sqlite3/base.py
2008-12-16 14:28:22 UTC (rev 9654)
+++ django/branches/releases/1.0.X/django/db/backends/sqlite3/base.py
2008-12-16 14:34:12 UTC (rev 9655)
@@ -10,6 +10,7 @@
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 @@
# 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
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
