From 8d2c0c2ab4e5f5d4c930c344e0cdc7b800f6c17a Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Tue, 16 Mar 1999 16:40:01 +0000 Subject: [PATCH] Fixed minor nits, added index entries to make these easier to find for people not familiar with Unix terminology. --- Doc/lib/libfnmatch.tex | 14 ++++++++------ Doc/lib/libglob.tex | 12 +++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Doc/lib/libfnmatch.tex b/Doc/lib/libfnmatch.tex index 78d0318ec67..6557b61e7a6 100644 --- a/Doc/lib/libfnmatch.tex +++ b/Doc/lib/libfnmatch.tex @@ -1,14 +1,15 @@ \section{\module{fnmatch} --- - \UNIX{} shell style pathname pattern matching.} -\declaremodule{standard}{fnmatch} + \UNIX{} style filename pattern matching} -\modulesynopsis{\UNIX{} shell style pathname pattern matching.} +\declaremodule{standard}{fnmatch} +\modulesynopsis{\UNIX{} shell style filename pattern matching.} This module provides support for \UNIX{} shell-style wildcards, which are \emph{not} the same as regular expressions (which are documented -in the \module{re}\refstmodindex{re} module). The special characters -used in shell-style wildcards are: +in the \refmodule{re}\refstmodindex{re} module). The special +characters used in shell-style wildcards are: +\index{filenames!wildcard expansion} \begin{list}{}{\leftmargin 0.5in \labelwidth 0.45in} \item[\code{*}] matches everything @@ -38,6 +39,7 @@ Test whether \var{filename} matches \var{pattern}, returning true or false; the comparision is case-sensitive. \end{funcdesc} + \begin{seealso} -\seemodule{glob}{Shell-style path expansion} + \seemodule{glob}{Shell-style path expansion} \end{seealso} diff --git a/Doc/lib/libglob.tex b/Doc/lib/libglob.tex index 5ef06f3723c..9efc5aabdac 100644 --- a/Doc/lib/libglob.tex +++ b/Doc/lib/libglob.tex @@ -1,7 +1,7 @@ \section{\module{glob} --- - \UNIX{} shell style pathname pattern expansion.} -\declaremodule{standard}{glob} + \UNIX{} style pathname pattern expansion} +\declaremodule{standard}{glob} \modulesynopsis{\UNIX{} shell style pathname pattern expansion.} @@ -13,13 +13,14 @@ using the \function{os.listdir()} and \function{fnmatch.fnmatch()} functions in concert, and not by actually invoking a subshell. (For tilde and shell variable expansion, use \function{os.path.expanduser()} and \function{os.path.expandvars()}.) +\index{filenames!pathname expansion} \begin{funcdesc}{glob}{pathname} Returns a possibly-empty list of path names that match \var{pathname}, which must be a string containing a path specification. \var{pathname} can be either absolute (like \file{/usr/src/Python-1.5/Makefile}) or relative (like -\file{../../Tools/*.gif}), and can contain shell-style wildcards. +\file{../../Tools/*/*.gif}), and can contain shell-style wildcards. \end{funcdesc} For example, consider a directory containing only the following files: @@ -36,3 +37,8 @@ of the path are preserved. >>> glob.glob('?.gif') ['1.gif'] \end{verbatim} + + +\begin{seealso} + \seemodule{fnmatch}{Shell-style filename (not path) expansion} +\end{seealso}