diff options
| author | James Bennett <ubernostrum@gmail.com> | 2007-01-30 19:04:57 +0000 |
|---|---|---|
| committer | James Bennett <ubernostrum@gmail.com> | 2007-01-30 19:04:57 +0000 |
| commit | eb97c80010dc50d42cf3af7fe8aeaff22beb5b64 (patch) | |
| tree | 9c71f2f1e3e265db74894bc21607b8dd62a8faaf | |
| parent | 78217bfc3a22edac3986bd11035b9bff3c186bc9 (diff) | |
| download | django-stable/0.90.x.tar.gz | |
0.90-bugfixes: fix for backport in [4418]stable/0.90.x
git-svn-id: http://code.djangoproject.com/svn/django/branches/0.90-bugfixes@4452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/db/backends/postgresql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/db/backends/postgresql.py b/django/core/db/backends/postgresql.py index fa587f01ca..98657e2358 100644 --- a/django/core/db/backends/postgresql.py +++ b/django/core/db/backends/postgresql.py @@ -47,7 +47,7 @@ class DatabaseWrapper: 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 @@ class DatabaseWrapper: 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 |