Author: mtredinnick
Date: 2008-08-24 23:13:27 -0500 (Sun, 24 Aug 2008)
New Revision: 8532
Modified:
django/trunk/django/db/backends/postgresql_psycopg2/base.py
django/trunk/tests/modeltests/field_defaults/models.py
Log:
Fixed #7464 -- Fixed the psycopg2 backend to handle SafeString values as
parameters. Based on a patch from [EMAIL PROTECTED]
Modified: django/trunk/django/db/backends/postgresql_psycopg2/base.py
===================================================================
--- django/trunk/django/db/backends/postgresql_psycopg2/base.py 2008-08-25
04:00:15 UTC (rev 8531)
+++ django/trunk/django/db/backends/postgresql_psycopg2/base.py 2008-08-25
04:13:27 UTC (rev 8532)
@@ -10,8 +10,8 @@
from django.db.backends.postgresql.creation import DatabaseCreation
from django.db.backends.postgresql.version import get_version
from django.db.backends.postgresql_psycopg2.introspection import
DatabaseIntrospection
+from django.utils.safestring import SafeUnicode, SafeString
-from django.utils.safestring import SafeUnicode
try:
import psycopg2 as Database
import psycopg2.extensions
@@ -23,6 +23,7 @@
IntegrityError = Database.IntegrityError
psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+psycopg2.extensions.register_adapter(SafeString,
psycopg2.extensions.QuotedString)
psycopg2.extensions.register_adapter(SafeUnicode,
psycopg2.extensions.QuotedString)
class DatabaseFeatures(BaseDatabaseFeatures):
Modified: django/trunk/tests/modeltests/field_defaults/models.py
===================================================================
--- django/trunk/tests/modeltests/field_defaults/models.py 2008-08-25
04:00:15 UTC (rev 8531)
+++ django/trunk/tests/modeltests/field_defaults/models.py 2008-08-25
04:13:27 UTC (rev 8532)
@@ -49,8 +49,10 @@
>>> d.seconds < 5
True
-# make sure that SafeUnicode fields work
->>> from django.utils.safestring import SafeUnicode
+# make sure that SafeString/SafeUnicode fields work
+>>> from django.utils.safestring import SafeUnicode, SafeString
>>> a.headline = SafeUnicode(u'SafeUnicode Headline')
>>> a.save()
+>>> a.headline = SafeString(u'SafeString Headline')
+>>> a.save()
"""}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
