benjaminp
diff --git a/Collapse file
‎MySQLdb/connections.py‎
Copy file name to clipboardExpand all lines: MySQLdb/connections.py
-2Lines changed: 0 additions & 2 deletions b/Collapse file
‎MySQLdb/connections.py‎
Copy file name to clipboardExpand all lines: MySQLdb/connections.py
-2Lines changed: 0 additions & 2 deletions
diff --git a/Collapse file
‎MySQLdb/cursors.py‎
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+8-18Lines changed: 8 additions & 18 deletions b/Collapse file
‎MySQLdb/cursors.py‎
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+8-18Lines changed: 8 additions & 18 deletions
@@ -17,15 +17,13 @@
 
 def defaulterrorhandler(connection, cursor, errorclass, errorvalue):
     """
-
     If cursor is not None, (errorclass, errorvalue) is appended to
     cursor.messages; otherwise it is appended to
     connection.messages. Then errorclass is raised with errorvalue as
     the value.
 
     You can override this with your own error handler by assigning it
     to the instance.
-
     """
     error = errorclass, errorvalue
     if cursor:
 
@@ -44,7 +44,6 @@
 
 
 class BaseCursor(object):
-    
     """A base for Cursor classes. Useful attributes:
     
     description
@@ -59,7 +58,6 @@ class BaseCursor(object):
     
     arraysize
         default number of rows fetchmany() will fetch
-
     """
 
     from _mysql_exceptions import MySQLError, Warning, Error, InterfaceError, \
@@ -85,17 +83,15 @@ def __init__(self, connection):
         self._info = None
         self.rownumber = None
 
-    def __del__(self):
-        self.close()
-        self.errorhandler = None
-        self._result = None
-
     def close(self):
         """Close the cursor. No further queries will be possible."""
         if self.connection is None or self.connection() is None:
             return
-        while self.nextset(): pass
+        while self.nextset():
+            pass
         self.connection = None
+        self.errorhandler = None
+        self._result = None
 
     def _check_executed(self):
         if not self._executed:
@@ -124,7 +120,7 @@ def nextset(self):
         if self._executed:
             self.fetchall()
         del self.messages[:]
-        
+
         db = self._get_db()
         nr = db.next_result()
         if nr == -1:
@@ -135,7 +131,7 @@ def nextset(self):
         return 1
 
     def _post_get_result(self): pass
-    
+
     def _do_get_result(self):
         db = self._get_db()
         self._result = self._get_result()
@@ -162,7 +158,6 @@ def _get_db(self):
         return con
 
     def execute(self, query, args=None):
-
         """Execute a query.
         
         query -- string, query to execute on server
@@ -173,9 +168,9 @@ def execute(self, query, args=None):
         %(key)s must be used as the placeholder.
 
         Returns long integer rows affected, if any
-
         """
-        del self.messages[:]
+        while self.nextset():
+            pass
         db = self._get_db()
 
         # NOTE:
@@ -206,23 +201,19 @@ def execute(self, query, args=None):
         except TypeError as m:
             if m.args[0] in ("not enough arguments for format string",
                              "not all arguments converted"):
-                self.messages.append((ProgrammingError, m.args[0]))
                 self.errorhandler(self, ProgrammingError, m.args[0])
             else:
-                self.messages.append((TypeError, m))
                 self.errorhandler(self, TypeError, m)
         except (SystemExit, KeyboardInterrupt):
             raise
         except:
             exc, value = sys.exc_info()[:2]
-            self.messages.append((exc, value))
             self.errorhandler(self, exc, value)
         self._executed = query
         if not self._defer_warnings: self._warning_check()
         return r
 
     def executemany(self, query, args):
-
         """Execute a multi-row query.
         
         query -- string, query to execute on server
@@ -237,7 +228,6 @@ def executemany(self, query, args):
         This method improves performance on multiple-row INSERT and
         REPLACE. Otherwise it is equivalent to looping over args with
         execute().
-
         """
         del self.messages[:]
         db = self._get_db()