diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-21 11:20:28 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-21 11:20:28 (GMT) |
| commit | e1c981161c49ce6bc232b62f85ca222530491dae (patch) | |
| tree | 2e092c9be8b0cd874ce26022e3f58aae64c04f07 /Doc/using | |
| parent | 9bd667ad030913ead3a789f45e73c26f9f28fb46 (diff) | |
| download | cpython-e1c981161c49ce6bc232b62f85ca222530491dae.zip cpython-e1c981161c49ce6bc232b62f85ca222530491dae.tar.gz cpython-e1c981161c49ce6bc232b62f85ca222530491dae.tar.bz2 | |
Merged revisions 60143-60149 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60143 | georg.brandl | 2008-01-20 15:50:05 +0100 (Sun, 20 Jan 2008) | 3 lines
Switch mmap from old Py_FindMethod to new PyObject_GenericGetAttr attribute access.
Fixes #1087735.
........
r60145 | georg.brandl | 2008-01-20 20:40:58 +0100 (Sun, 20 Jan 2008) | 2 lines
Add blurb about executable scripts on Windows. #760657.
........
r60146 | georg.brandl | 2008-01-20 20:48:40 +0100 (Sun, 20 Jan 2008) | 2 lines
#1219903: fix tp_richcompare docs.
........
r60147 | georg.brandl | 2008-01-20 22:10:08 +0100 (Sun, 20 Jan 2008) | 2 lines
Fix markup.
........
r60148 | gregory.p.smith | 2008-01-21 08:11:11 +0100 (Mon, 21 Jan 2008) | 14 lines
Provide a sanity check during PyThreadState_DeleteCurrent() and
PyThreadState_Delete() to avoid an infinite loop when the tstate list
is messed up and has somehow becomes circular and does not contain the
current thread.
I don't know how this happens but it does, *very* rarely. On more than
one hardware platform. I have not been able to reproduce it manually.
Attaching to a process where its happening: it has always been in an
infinite loop over a single element tstate list that is not the tstate
we're looking to delete. It has been in t_bootstrap()'s call to
PyThreadState_DeleteCurrent() as a pthread is exiting.
........
r60149 | georg.brandl | 2008-01-21 11:24:59 +0100 (Mon, 21 Jan 2008) | 2 lines
#1269: fix a bug in pstats.add_callers() and add a unit test file for pstats.
........
Diffstat (limited to 'Doc/using')
| -rw-r--r-- | Doc/using/cmdline.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index ba3e1c9..3dcfc7e 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -297,14 +297,14 @@ These environment variables influence Python's behavior. .. envvar:: PYTHONHOME Change the location of the standard Python libraries. By default, the - libraries are searched in :file:`{prefix}/lib/python<version>` and - :file:`{exec_prefix}/lib/python<version>`, where :file:`{prefix}` and + libraries are searched in :file:`{prefix}/lib/python{version}` and + :file:`{exec_prefix}/lib/python{version}`, where :file:`{prefix}` and :file:`{exec_prefix}` are installation-dependent directories, both defaulting to :file:`/usr/local`. When :envvar:`PYTHONHOME` is set to a single directory, its value replaces both :file:`{prefix}` and :file:`{exec_prefix}`. To specify different values - for these, set :envvar:`PYTHONHOME` to :file:`{prefix}:{exec_prefix}``. + for these, set :envvar:`PYTHONHOME` to :file:`{prefix}:{exec_prefix}`. .. envvar:: PYTHONPATH @@ -314,7 +314,7 @@ These environment variables influence Python's behavior. colons. Non-existent directories are silently ignored. The default search path is installation dependent, but generally begins with - :file:`{prefix}/lib/python<version>`` (see :envvar:`PYTHONHOME` above). It + :file:`{prefix}/lib/python{version}`` (see :envvar:`PYTHONHOME` above). It is *always* appended to :envvar:`PYTHONPATH`. If a script argument is given, the directory containing the script is |