summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-08-14 21:11:06 +0200
committerClaude Paroz <claude@2xlibre.net>2016-08-15 20:57:57 +0200
commit21aec54296708ae29a06d9a5b97ba665bed44394 (patch)
tree2e1cd53cc3376d2bf523fa9068834ad39dd406fa
parent89f17e7caf0d1e70417253d135607c9fd6ebac56 (diff)
Removed unnecessary registration of psycopg2 unicode extensions on Python 3
-rw-r--r--django/db/backends/postgresql/base.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index 90f28703af..19afa48047 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -12,6 +12,7 @@ from django.db import DEFAULT_DB_ALIAS
from django.db.backends.base.base import BaseDatabaseWrapper
from django.db.backends.base.validation import BaseDatabaseValidation
from django.db.utils import DatabaseError as WrappedDatabaseError
+from django.utils import six
from django.utils.encoding import force_str
from django.utils.functional import cached_property
from django.utils.safestring import SafeBytes, SafeText
@@ -47,8 +48,9 @@ from .version import get_version # NOQA isort:skip
DatabaseError = Database.DatabaseError
IntegrityError = Database.IntegrityError
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
+if six.PY2:
+ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+ psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
psycopg2.extensions.register_adapter(SafeBytes, psycopg2.extensions.QuotedString)
psycopg2.extensions.register_adapter(SafeText, psycopg2.extensions.QuotedString)
psycopg2.extras.register_uuid()