From 127059fa73e4c93a179b099fe6ecaa12b615b5ee Mon Sep 17 00:00:00 2001 From: adustman Date: Thu, 14 Mar 2002 20:43:51 +0000 Subject: [PATCH] Bump version. Minor Alpha Linux update. Clear errorhandler on close. --- MySQLdb/MySQLdb/__init__.py | 4 ++-- MySQLdb/MySQLdb/connections.py | 1 + MySQLdb/MySQLdb/cursors.py | 2 +- MySQLdb/_mysql.c | 2 +- MySQLdb/setup.py | 4 +++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MySQLdb/MySQLdb/__init__.py b/MySQLdb/MySQLdb/__init__.py index f6cfb8e..994c247 100644 --- a/MySQLdb/MySQLdb/__init__.py +++ b/MySQLdb/MySQLdb/__init__.py @@ -19,8 +19,8 @@ version_info = ( 0, 9, 2, - "alpha", - 2) + "beta", + 1) if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3] else: __version__ = "%d.%d.%d%1.1s%d" % version_info[:5] diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py index b701d3b..12f8f13 100644 --- a/MySQLdb/MySQLdb/connections.py +++ b/MySQLdb/MySQLdb/connections.py @@ -73,6 +73,7 @@ class Connection: def __del__(self): if hasattr(self, '_db'): self.close() + print "Alas! I die!" def close(self): """Close the connection. No further activity possible.""" diff --git a/MySQLdb/MySQLdb/cursors.py b/MySQLdb/MySQLdb/cursors.py index 7abdfd6..ccc9892 100644 --- a/MySQLdb/MySQLdb/cursors.py +++ b/MySQLdb/MySQLdb/cursors.py @@ -46,8 +46,8 @@ class BaseCursor: def close(self): """Close the cursor. No further queries will be possible.""" - if not self.connection: return self.connection = None + self.errorhandler = None def _check_executed(self): if not self._executed: diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c index 0ec9492..15da672 100644 --- a/MySQLdb/_mysql.c +++ b/MySQLdb/_mysql.c @@ -1,4 +1,4 @@ -#define version_info "(0,9,2,'alpha',2)" +#define version_info "(0,9,2,'beta',1)" #define __version__ "0.9.2" /* This program is free software; you can redistribute it and/or modify diff --git a/MySQLdb/setup.py b/MySQLdb/setup.py index bc73796..4f81b56 100644 --- a/MySQLdb/setup.py +++ b/MySQLdb/setup.py @@ -63,6 +63,8 @@ elif sys.platform == "cygwin": extra_compile_args = ['-DMS_WIN32'] elif sys.platform[:6] == "darwin": # Mac OS X extra_link_args = ['-flat_namespace'] +elif sys.platform == 'linux2' and os.environ.get('HOSTTYPE') == 'alpha': + libraries.extend(['ots', 'cpml']) elif os.name == "posix": # UNIX-ish platforms not covered above pass # default should work else: @@ -90,7 +92,7 @@ MySQLdb. MySQLdb is free software. setup (# Distribution meta-data name = "MySQL-python", - version = "0.9.2a2", + version = "0.9.2b1", description = "An interface to MySQL", long_description=long_description, author = "Andy Dustman",