Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
James Bennett authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  django/core/db/backends/postgresql.py
4  django/core/db/backends/postgresql.py
@@ -54,7 +54,7 @@ def __init__(self):
54 54
         self.queries = []
55 55
 
56 56
     def cursor(self):
57  
-        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, TIME_ZONE
  57
+        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, DEFAULT_CHARSET, TIME_ZONE
58 58
         if self.connection is None:
59 59
             if DATABASE_NAME == '':
60 60
                 from django.core.exceptions import ImproperlyConfigured
@@ -72,7 +72,7 @@ def cursor(self):
72 72
             self.connection.set_isolation_level(1) # make transactions transparent to all cursors
73 73
         cursor = self.connection.cursor()
74 74
         cursor.execute("SET TIME ZONE %s", [TIME_ZONE])
75  
-        cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET)
  75
+        cursor = UnicodeCursorWrapper(cursor, DEFAULT_CHARSET)
76 76
         if DEBUG:
77 77
             return base.CursorDebugWrapper(cursor, self)
78 78
         return cursor

0 notes on commit 02ca9fd

Please sign in to comment.
Something went wrong with that request. Please try again.