Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

0.90-bugfixes: fix for backport in [4418]

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.90-bugfixes@4452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit eb97c80010dc50d42cf3af7fe8aeaff22beb5b64 1 parent 78217bf
@ubernostrum ubernostrum authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/core/db/backends/postgresql.py
View
4 django/core/db/backends/postgresql.py
@@ -47,7 +47,7 @@ def __init__(self):
self.queries = []
def cursor(self):
- from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, TIME_ZONE
+ from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, DEFAULT_CHARSET, TIME_ZONE
if self.connection is None:
if DATABASE_NAME == '':
from django.core.exceptions import ImproperlyConfigured
@@ -65,7 +65,7 @@ def cursor(self):
self.connection.set_isolation_level(1) # make transactions transparent to all cursors
cursor = self.connection.cursor()
cursor.execute("SET TIME ZONE %s", [TIME_ZONE])
- cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET)
+ cursor = UnicodeCursorWrapper(cursor, DEFAULT_CHARSET)
if DEBUG:
return base.CursorDebugWrapper(cursor, self)
return cursor
Please sign in to comment.
Something went wrong with that request. Please try again.