Changeset 6816

Timestamp:

12/01/07 16:26:24 (7 months ago)

Author:

mtredinnick

Message:

Fixed #5996 -- Add a pyscopg2 convertor for SafeUnicode? -> unicode. Thanks, remco@diji.biz

Files:

• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/trunk/tests/modeltests/field_defaults/models.py (modified) (1 diff)

django/trunk/django/db/backends/postgresql_psycopg2/base.py

@@ -7 +7 @@
-from django.db.backends import BaseDatabaseWrapper, BaseDatabaseFeatures
-from django.db.backends.postgresql.operations import DatabaseOperations as PostgresqlDatabaseOperations
+from django.utils.safestring import SafeUnicode
-try:
-    import psycopg2 as Database
@@ -18 +19 @@
-
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString)
-
-class DatabaseFeatures(BaseDatabaseFeatures):

django/trunk/tests/modeltests/field_defaults/models.py

@@ -49 +49 @@
->>> d.seconds < 5
-True
+
+# make sure that SafeUnicode fields work
+>>> from django.utils.safestring import SafeUnicode
+>>> a.headline = SafeUnicode(u'SafeUnicode Headline')
+>>> a.save()
-"""}