summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-09-08 02:49:53 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-09-08 02:49:53 (GMT)
commitff6382b40dfe6c0c978f25f027a72ac91c5449a6 (patch)
treec7fb2363110942fe9e6845b56e3497532be7c0f6 /Doc/library
parent68d7f78703d8b1dbae79d51d8910b21bfefa1a32 (diff)
parent0494c2ae7f6a347590d66bb4fe7980dc0dc9ccda (diff)
downloadcpython-ff6382b40dfe6c0c978f25f027a72ac91c5449a6.zip
cpython-ff6382b40dfe6c0c978f25f027a72ac91c5449a6.tar.gz
cpython-ff6382b40dfe6c0c978f25f027a72ac91c5449a6.tar.bz2
Merge #18952 fix from 3.3
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/test.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index bce0f64..c1270f4 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -263,12 +263,15 @@ The :mod:`test.support` module defines the following functions:
Used when tests are executed by :mod:`test.regrtest`.
-.. function:: findfile(filename)
+.. function:: findfile(filename, subdir=None)
Return the path to the file named *filename*. If no match is found
*filename* is returned. This does not equal a failure since it could be the
path to the file.
+ Setting *subdir* indicates a relative path to use to find the file
+ rather than looking directly in the path directories.
+
.. function:: run_unittest(\*classes)