Author: ubernostrum
Date: 2007-01-30 13:06:08 -0600 (Tue, 30 Jan 2007)
New Revision: 4453

Modified:
   django/branches/0.91-bugfixes/django/core/db/backends/postgresql.py
Log:
0.91-bugfixes: settings fix for backport in [4419]


Modified: django/branches/0.91-bugfixes/django/core/db/backends/postgresql.py
===================================================================
--- django/branches/0.91-bugfixes/django/core/db/backends/postgresql.py 
2007-01-30 19:04:57 UTC (rev 4452)
+++ django/branches/0.91-bugfixes/django/core/db/backends/postgresql.py 
2007-01-30 19:06:08 UTC (rev 4453)
@@ -54,7 +54,7 @@
         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 @@
             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


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to