Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

0.91-bugfixes: settings fix for backport in [4419]

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.91-bugfixes@4453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 02ca9fd1ded3f4d50be7166033af7a676e042625 1 parent d0672a7
@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
@@ -54,7 +54,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
@@ -72,7 +72,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.