Fixed #321 -- Undid [494], which assumed the installed version of MySQLdb had a 'cursors.CursorNW'. Thanks for being consistent, MySQLdb. This opens #316 again.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
a9b43edde2
commit
bf108187a2
|
@ -9,7 +9,6 @@ from django.core.db.dicthelpers import *
|
|||
import MySQLdb as Database
|
||||
from MySQLdb.converters import conversions
|
||||
from MySQLdb.constants import FIELD_TYPE
|
||||
from MySQLdb.cursors import CursorNW # Ignores MySQL warnings.
|
||||
import types
|
||||
|
||||
DatabaseError = Database.DatabaseError
|
||||
|
@ -31,8 +30,7 @@ class DatabaseWrapper:
|
|||
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG
|
||||
if self.connection is None:
|
||||
self.connection = Database.connect(user=DATABASE_USER, db=DATABASE_NAME,
|
||||
passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions,
|
||||
cursorclass=CursorNW)
|
||||
passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions)
|
||||
if DEBUG:
|
||||
return base.CursorDebugWrapper(self.connection.cursor(), self)
|
||||
return self.connection.cursor()
|
||||
|
|
Loading…
Reference in New Issue