From 3f682adcf2c4507d90ac464bc8ec70b13f8b8412 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 13 Jul 2010 23:14:46 +0000 Subject: [PATCH] Partial port of r78919 from trunk: add subdir argument to the findfile helper --- Lib/test/support.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/support.py b/Lib/test/support.py index 1eb84ebc14b..11bb16826b5 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -387,12 +387,14 @@ if fp is not None: unlink(TESTFN) del fp -def findfile(file, here=__file__): +def findfile(file, here=__file__, subdir=None): """Try to find a file on sys.path and the working directory. If it is not found the argument passed to the function is returned (this does not necessarily signal failure; could still be the legitimate path).""" if os.path.isabs(file): return file + if subdir is not None: + file = os.path.join(subdir, file) path = sys.path path = [os.path.dirname(here)] + path for dn in path: