diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-07-11 22:15:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-07-11 22:15:13 (GMT) |
| commit | 9bd39c119e9b858c18191e0c1a7ffe5c3bcd1fe2 (patch) | |
| tree | 77f6b25c94617412787b42561e7f1599a3eee020 | |
| parent | 51f32c00e8006101c5dd70c79f7f132e4a658497 (diff) | |
| download | cpython-9bd39c119e9b858c18191e0c1a7ffe5c3bcd1fe2.zip cpython-9bd39c119e9b858c18191e0c1a7ffe5c3bcd1fe2.tar.gz cpython-9bd39c119e9b858c18191e0c1a7ffe5c3bcd1fe2.tar.bz2 | |
put downloaded test support files in Lib/test/data instead of the cwd
| -rw-r--r-- | .bzrignore | 17 | ||||
| -rw-r--r-- | .hgignore | 17 | ||||
| -rw-r--r-- | Lib/test/test_support.py | 9 | ||||
| -rw-r--r-- | Makefile.pre.in | 1 |
4 files changed, 5 insertions, 39 deletions
@@ -14,24 +14,7 @@ platform pyconfig.h libpython*.a python.exe -CP936.TXT -SHIFT_JISX0213.TXT -JOHAB.TXT -EUC-JP.TXT -NormalizationTest-3.2.0.txt -NormalizationTest.txt -BIG5.TXT -BIG5HKSCS-2004.TXT -CP949.TXT -EUC-CN.TXT -BIG5HKSCS.TXT -SHIFTJIS.TXT -EUC-KR.TXT -EUC-JISX0213.TXT -CP932.TXT -CP950.TXT reflog.txt -gb-18030-2000.xml tags TAGS .gdb_history @@ -1,24 +1,8 @@ .gdb_history .purify .svn -BIG5.TXT -BIG5HKSCS-2004.TXT -BIG5HKSCS.TXT -CP932.TXT -CP936.TXT -CP949.TXT -CP950.TXT -EUC-CN.TXT -EUC-JISX0213.TXT -EUC-JP.TXT -EUC-KR.TXT -JOHAB.TXT Makefile Makefile.pre -NormalizationTest-3.2.0.txt -NormalizationTest.txt -SHIFTJIS.TXT -SHIFT_JISX0213.TXT TAGS autom4te.cache build @@ -28,7 +12,6 @@ config.log config.status config.status.lineno db_home -gb-18030-2000.xml platform pyconfig.h python diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 4b14c3b..432fa52 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -468,13 +468,12 @@ def open_urlresource(url): requires('urlfetch') filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL! - for path in [os.path.curdir, os.path.pardir]: - fn = os.path.join(path, filename) - if os.path.exists(fn): - return open(fn) + fn = os.path.join(os.path.dirname(__file__), "data", filename) + if os.path.exists(fn): + return open(fn) print >> get_original_stdout(), '\tfetching %s ...' % url - fn, _ = urllib.urlretrieve(url, filename) + fn, _ = urllib.urlretrieve(url, fn) return open(fn) diff --git a/Makefile.pre.in b/Makefile.pre.in index 71ded8e..42837f6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1173,6 +1173,7 @@ clobber: clean profile-removal # remove all generated files, even Makefile[.pre] # Keep configure and Python-ast.[ch], it's possible they can't be generated distclean: clobber + -rm -f Lib/test/data/* -rm -f core Makefile Makefile.pre config.status \ Modules/Setup Modules/Setup.local Modules/Setup.config find $(srcdir) '(' -name '*.fdc' -o -name '*~' \ |