diff options
| -rw-r--r-- | Doc/api/api.tex | 11 | ||||
| -rw-r--r-- | Doc/lib/libsite.tex | 10 | ||||
| -rw-r--r-- | Doc/lib/libstdtypes.tex | 3 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Doc/api/api.tex b/Doc/api/api.tex index 9396960a89..d4d2425779 100644 --- a/Doc/api/api.tex +++ b/Doc/api/api.tex @@ -102,7 +102,7 @@ the installation directory specified to the installer. To include the headers, place both directories (if different) on your compiler's search path for includes. Do \emph{not} place the parent directories on the search path and then use -\samp{\#include <python\var{version}/Python.h>}; this will break on +\samp{\#include <python\shortversion/Python.h>}; this will break on multi-platform builds since the platform independent headers under \envvar{prefix} include the platform specific headers from \envvar{exec_prefix}. @@ -550,14 +550,13 @@ 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\var{version}} (replacing \var{version} 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}). +\file{lib/python\shortversion} 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\var{version}}. (In fact, this particular path +\file{/usr/local/lib/python\shortversion}. (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/libsite.tex b/Doc/lib/libsite.tex index 2814fe3d93..b895a7355f 100644 --- a/Doc/lib/libsite.tex +++ b/Doc/lib/libsite.tex @@ -19,7 +19,7 @@ It starts by constructing up to four directories from a head and a tail part. For the head part, it uses \code{sys.prefix} and \code{sys.exec_prefix}; empty heads are skipped. For the tail part, it uses the empty string (on Macintosh or Windows) or -it uses first \file{lib/python{\var{version}}/site-packages} and then +it uses first \file{lib/python\shortversion/site-packages} and then \file{lib/site-python} (on \UNIX{}). For each of the distinct head-tail combinations, it sees if it refers to an existing directory, and if so, adds to \code{sys.path}, and also inspected for path @@ -39,10 +39,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\var{version}} (where -\var{version} is the first three characters of \code{sys.version}). -Suppose this has a subdirectory -\file{/usr/local/lib/python\var{version}/site-packages} with three +installed in \file{/usr/local/lib/python\shortversion} (where only the +first three characters of \code{sys.version} are used to form the +installation path name). Suppose this has a subdirectory +\file{/usr/local/lib/python\shortversion/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/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex index 3e9cc53eee..3d5f68fb4a 100644 --- a/Doc/lib/libstdtypes.tex +++ b/Doc/lib/libstdtypes.tex @@ -869,7 +869,8 @@ defines \code{\var{m}.a} to be \code{1}, but you can't write Modules built into the interpreter are written like this: \code{<module 'sys' (built-in)>}. If loaded from a file, they are -written as \code{<module 'os' from '/usr/local/lib/python1.5/os.pyc'>}. +written as \code{<module 'os' from +'/usr/local/lib/python\shortversion/os.pyc'>}. \subsubsection{Classes and Class Instances \label{typesobjects}} |