Django

Code

Changeset 4452

Show
Ignore:
Timestamp:
01/30/07 13:04:57 (2 years ago)
Author:
ubernostrum
Message:

0.90-bugfixes: fix for backport in [4418]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/0.90-bugfixes/django/core/db/backends/postgresql.py

    r4418 r4452  
    4848 
    4949    def cursor(self): 
    50         from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, TIME_ZONE 
     50        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, DEFAULT_CHARSET, TIME_ZONE 
    5151        if self.connection is None: 
    5252            if DATABASE_NAME == '': 
     
    6666        cursor = self.connection.cursor() 
    6767        cursor.execute("SET TIME ZONE %s", [TIME_ZONE]) 
    68         cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET) 
     68        cursor = UnicodeCursorWrapper(cursor, DEFAULT_CHARSET) 
    6969        if DEBUG: 
    7070            return base.CursorDebugWrapper(cursor, self)