From 2de75ec245adbe0cc5e6fa831935db4b85a47a42 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Thu, 9 Apr 1998 14:12:11 +0000 Subject: [PATCH] Don't assume that \version expands to the 3-character major.minor number; it is the full release version name ("1.5.1beta1", for instance). --- Doc/api.tex | 4 ++-- Doc/api/api.tex | 4 ++-- Doc/lib/libglob.tex | 2 +- Doc/lib/libsite.tex | 6 ++++-- Doc/libglob.tex | 2 +- Doc/libsite.tex | 6 ++++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Doc/api.tex b/Doc/api.tex index e0c3ad2a5bf..5b87fd6ed9e 100644 --- a/Doc/api.tex +++ b/Doc/api.tex @@ -509,14 +509,14 @@ calculates the module search path based upon its best guess for the location of the standard Python interpreter executable, assuming that the Python library is found in a fixed location relative to the Python interpreter executable. In particular, it looks for a directory named -\file{lib/python\version} (replacing \file{\version} with the current +\file{lib/python1.5} (replacing \file{1.5} with the current interpreter version) relative to the parent directory where the executable named \file{python} is found on the shell command search path (the environment variable \envvar{PATH}). For instance, if the Python executable is found in \file{/usr/local/bin/python}, it will assume that the libraries are in -\file{/usr/local/lib/python\version}. (In fact, this particular path +\file{/usr/local/lib/python1.5}. (In fact, this particular path is also the ``fallback'' location, used when no executable file named \file{python} is found along \envvar{PATH}.) The user can override this behavior by setting the environment variable \envvar{PYTHONHOME}, diff --git a/Doc/api/api.tex b/Doc/api/api.tex index e0c3ad2a5bf..5b87fd6ed9e 100644 --- a/Doc/api/api.tex +++ b/Doc/api/api.tex @@ -509,14 +509,14 @@ calculates the module search path based upon its best guess for the location of the standard Python interpreter executable, assuming that the Python library is found in a fixed location relative to the Python interpreter executable. In particular, it looks for a directory named -\file{lib/python\version} (replacing \file{\version} with the current +\file{lib/python1.5} (replacing \file{1.5} with the current interpreter version) relative to the parent directory where the executable named \file{python} is found on the shell command search path (the environment variable \envvar{PATH}). For instance, if the Python executable is found in \file{/usr/local/bin/python}, it will assume that the libraries are in -\file{/usr/local/lib/python\version}. (In fact, this particular path +\file{/usr/local/lib/python1.5}. (In fact, this particular path is also the ``fallback'' location, used when no executable file named \file{python} is found along \envvar{PATH}.) The user can override this behavior by setting the environment variable \envvar{PYTHONHOME}, diff --git a/Doc/lib/libglob.tex b/Doc/lib/libglob.tex index 6864c77fa09..10f667ad69b 100644 --- a/Doc/lib/libglob.tex +++ b/Doc/lib/libglob.tex @@ -15,7 +15,7 @@ and \function{os.path.expandvars()}.) 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\version/Makefile}) or relative (like +\file{/usr/src/Python-1.5/Makefile}) or relative (like \file{../../Tools/*.gif}), and can contain shell-style wildcards. \end{funcdesc} diff --git a/Doc/lib/libsite.tex b/Doc/lib/libsite.tex index 5ddbe8a36a8..84b1e640482 100644 --- a/Doc/lib/libsite.tex +++ b/Doc/lib/libsite.tex @@ -36,8 +36,10 @@ refers to a directory (rather than a file). No item is added to For example, suppose \code{sys.prefix} and \code{sys.exec_prefix} are set to \file{/usr/local}. The Python \version\ library is then -installed in \file{/usr/local/lib/python\version}. Suppose this has a -subdirectory \file{/usr/local/lib/python\version/site-packages} with three +installed in \file{/usr/local/lib/python1.5} (note that only the first +three characters of \code{sys.version} are used to form the path +name). Suppose this has a subdirectory +\file{/usr/local/lib/python1.5/site-packages} with three subsubdirectories, \file{foo}, \file{bar} and \file{spam}, and two path configuration files, \file{foo.pth} and \file{bar.pth}. Assume \file{foo.pth} contains the following: diff --git a/Doc/libglob.tex b/Doc/libglob.tex index 6864c77fa09..10f667ad69b 100644 --- a/Doc/libglob.tex +++ b/Doc/libglob.tex @@ -15,7 +15,7 @@ and \function{os.path.expandvars()}.) 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\version/Makefile}) or relative (like +\file{/usr/src/Python-1.5/Makefile}) or relative (like \file{../../Tools/*.gif}), and can contain shell-style wildcards. \end{funcdesc} diff --git a/Doc/libsite.tex b/Doc/libsite.tex index 5ddbe8a36a8..84b1e640482 100644 --- a/Doc/libsite.tex +++ b/Doc/libsite.tex @@ -36,8 +36,10 @@ refers to a directory (rather than a file). No item is added to For example, suppose \code{sys.prefix} and \code{sys.exec_prefix} are set to \file{/usr/local}. The Python \version\ library is then -installed in \file{/usr/local/lib/python\version}. Suppose this has a -subdirectory \file{/usr/local/lib/python\version/site-packages} with three +installed in \file{/usr/local/lib/python1.5} (note that only the first +three characters of \code{sys.version} are used to form the path +name). Suppose this has a subdirectory +\file{/usr/local/lib/python1.5/site-packages} with three subsubdirectories, \file{foo}, \file{bar} and \file{spam}, and two path configuration files, \file{foo.pth} and \file{bar.pth}. Assume \file{foo.pth} contains the following: