A few 2.3 cleanup items.

diff --git a/README b/README
index 28f843e99170f5ee7e58b23c18f903dec598b7e2..2f903d057c0746551aaaeae171692a1c898c1ea7 100644 (file)
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ The Python SQL Toolkit and Object Relational Mapper
 Requirements
 ------------
 
-SQLAlchemy requires Python 2.3 or higher.  One or more DB-API implementations
+SQLAlchemy requires Python 2.4 or higher.  One or more DB-API implementations
 are also required for database access.  See docs/intro.html for more
 information on supported DB-API implementations.
 

diff --git a/README.unittests b/README.unittests
index 747a1bf0f0eeb68868aaa7b33cce162151b0088e..0051ce6145ff3a4774e456d7b1ea394e7709591b 100644 (file)
--- a/README.unittests
+++ b/README.unittests
@@ -168,23 +168,6 @@ always possible.  If you hit a wall, join us on the mailing list or, better,
 IRC!
 
 
-ALTERNATE PYTHON IMPLEMENTATIONS
---------------------------------
-The test suite restricts itself to largely Python 2.3-level constructs and
-standard library features, with the notable exception of decorators, which are
-used extensively throughout the suite.
-
-A source transformation tool is included that allows testing on Python 2.3 or
-any other Python implementation that lacks @decorator support.
-
-To use it:
-
-  $ python test/clone.py -c --filter=py23 test23
-
-This will copy the test/ directory structure into test23/, with @decorators in
-the source code transformed into 2.3-friendly syntax.
-
-
 TIPS
 ----
 Postgres: The tests require an 'alt_schema' and 'alt_schema_2' to be present in

diff --git a/test/testlib/coverage.py b/test/testlib/coverage.py
index 0203dbf7d5dfe33316b94250afd6e8b9bd678d0c..fc0f2c23600b6c09dbad37993c5b89215bedf1e0 100644 (file)
--- a/test/testlib/coverage.py
+++ b/test/testlib/coverage.py
@@ -70,11 +70,6 @@ import token
 import types
 from socket import gethostname
 
-# Python version compatibility
-try:
-    strclass = basestring   # new to 2.3
-except:
-    strclass = str
 
 # 2. IMPLEMENTATION
 #
@@ -799,7 +794,7 @@ class coverage:
         # On windows, the shell doesn't expand wildcards.  Do it here.
         globbed = []
         for morf in morfs:
-            if isinstance(morf, strclass):
+            if isinstance(morf, basestring):
                 globbed.extend(glob.glob(morf))
             else:
                 globbed.append(morf)