Skip to content

Commit

Permalink
Fixed #321 -- Undid [494], which assumed the installed version of MyS…
Browse files Browse the repository at this point in the history
…QLdb 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
  • Loading branch information
adrianholovaty committed Aug 15, 2005
1 parent a9b43ed commit bf10818
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions django/core/db/backends/mysql.py
Expand Up @@ -9,7 +9,6 @@
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
Expand All @@ -31,8 +30,7 @@ def cursor(self):
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()
Expand Down

0 comments on commit bf10818

Please sign in to comment.