diff options
| author | Michael Trier <mtrier@gmail.com> | 2008-12-30 06:24:59 +0000 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2008-12-30 06:24:59 +0000 |
| commit | 4e8a817ac24e73f3e2d3e80f6939cefa7e9b0130 (patch) | |
| tree | 6fcf43d3eb5723ec9867bda68d8f251c31ca8061 | |
| parent | df267fcc77e116d0c64d62b0231526811dfb4769 (diff) | |
| download | sqlalchemy-4e8a817ac24e73f3e2d3e80f6939cefa7e9b0130.tar.gz | |
A few 2.3 cleanup items.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | README.unittests | 17 | ||||
| -rw-r--r-- | test/testlib/coverage.py | 7 |
3 files changed, 2 insertions, 24 deletions
@@ -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 747a1bf0f..0051ce614 100644 --- 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 0203dbf7d..fc0f2c236 100644 --- 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) |