diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 +0000 |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 +0000 |
| commit | 6a372812448d3462ac91d2c392f323b93df7e383 (patch) | |
| tree | a4b9f900e52561a91e0c4509dc6c692492996b7f /test/scons-time | |
| parent | f7ac1212e72b65e2840b9b116b962e3872e30e8e (diff) | |
| download | scons-6a372812448d3462ac91d2c392f323b93df7e383.tar.gz | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Comb out all code that supported earlier versions of Python. Most such
code is in snippets of only a few lines and can be identified by having
a Python version string in it. Such snippets add up; this combing pass
probably got rid of over 500 lines of code.
Diffstat (limited to 'test/scons-time')
| -rw-r--r-- | test/scons-time/help/all-subcommands.py | 2 | ||||
| -rw-r--r-- | test/scons-time/run/archive/zip.py | 22 |
2 files changed, 0 insertions, 24 deletions
diff --git a/test/scons-time/help/all-subcommands.py b/test/scons-time/help/all-subcommands.py index 43db3aed..03ddc466 100644 --- a/test/scons-time/help/all-subcommands.py +++ b/test/scons-time/help/all-subcommands.py @@ -20,8 +20,6 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -from __future__ import generators ### KEEP FOR COMPATIBILITY FIXERS __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" diff --git a/test/scons-time/run/archive/zip.py b/test/scons-time/run/archive/zip.py index 2fad3b85..4620440b 100644 --- a/test/scons-time/run/archive/zip.py +++ b/test/scons-time/run/archive/zip.py @@ -39,28 +39,6 @@ test.write_fake_scons_py() test.write_sample_project('foo.zip') -try: - import zipfile - # There's a bug in the Python 2.1 zipfile library that makes it blow - # up on 64-bit architectures, when trying to read normal 32-bit zip - # files. Check for it by trying to read the archive we just created, - # and skipping the test gracefully if there's a problem. - zf = zipfile.ZipFile('foo.zip', 'r') - for name in zf.namelist(): - zf.read(name) -except ImportError: - # This "shouldn't happen" because the early Python versions that - # have no zipfile module don't support the scons-time script, - # so the initialization above should short-circuit this test. - # But just in case... - fmt = "Python %s has no zipfile module. Skipping test.\n" - test.skip_test(fmt % sys.version[:3]) -except zipfile.BadZipfile, e: - if str(e)[:11] == 'Bad CRC-32 ': - fmt = "Python %s zipfile module doesn't work on 64-bit architectures. Skipping test.\n" - test.skip_test(fmt % sys.version[:3]) - raise - test.run(arguments = 'run foo.zip') test.must_exist('foo-000-0.log', |