summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-08-15 00:50:31 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-08-15 00:50:31 +0000
commitbf108187a2a1d36bf7b0a61575b331386043507e (patch)
treea97bb742664b924e60c500159859c4ef27812191
parenta9b43edde24e6bb2caa82864d9b8d865b2fea113 (diff)
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
-rw-r--r--django/core/db/backends/mysql.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/core/db/backends/mysql.py b/django/core/db/backends/mysql.py
index cdcaa32bc3..4a54a277e4 100644
--- a/django/core/db/backends/mysql.py
+++ b/django/core/db/backends/mysql.py
@@ -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()