Mercurial > p > mysql-python > mysqldb-2
changeset 54:6e31278d3433 MySQLdb
There's no good reason to delay imports when the module is (1) useless without
it or (2) you do the same late import more than once.
| author | kylev |
|---|---|
| date | Mon, 23 Feb 2009 23:52:44 +0000 |
| parents | 4bfc4e612de0 |
| children | e606fd52e866 |
| files | MySQLdb/cursors.py |
| diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/MySQLdb/cursors.py Mon Feb 23 23:46:37 2009 +0000 +++ b/MySQLdb/cursors.py Mon Feb 23 23:52:44 2009 +0000 @@ -11,6 +11,8 @@ __author__ = "$Author$"[9:-2] import re +import sys +import weakref INSERT_VALUES = re.compile(r"\svalues\s*" r"(\(((?<!\\)'[^\)]*?\)[^\)]*(?<!\\)?'" @@ -40,14 +42,12 @@ from MySQLdb.exceptions import MySQLError, Warning, Error, InterfaceError, \ DatabaseError, DataError, OperationalError, IntegrityError, \ InternalError, ProgrammingError, NotSupportedError - + _defer_warnings = False _fetch_type = None - + def __init__(self, connection): - from weakref import proxy - - self.connection = proxy(connection) + self.connection = weakref.proxy(connection) self.description = None self.description_flags = None self.rowcount = -1 @@ -60,12 +60,12 @@ self._warnings = 0 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 not self.connection: @@ -162,7 +162,6 @@ Returns long integer rows affected, if any """ - from sys import exc_info del self.messages[:] db = self._get_db() charset = db.character_set_name() @@ -181,7 +180,7 @@ self.messages.append((TypeError, msg)) self.errorhandler(self, TypeError, msg) except: - exc, value, traceback = exc_info() + exc, value, traceback = sys.exc_info() del traceback self.messages.append((exc, value)) self.errorhandler(self, exc, value) @@ -236,8 +235,7 @@ self.messages.append((TypeError, msg)) self.errorhandler(self, TypeError, msg) except: - from sys import exc_info - exc, value, traceback = exc_info() + exc, value, traceback = sys.exc_info() del traceback self.errorhandler(self, exc, value) self.rowcount = int(self._query(