diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 19:17:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 19:17:57 (GMT) |
| commit | 611f8f5e8eb2742fd720dc0280e77b8d634639cb (patch) | |
| tree | ee504fb9957b4780173468ebb9d193be3c2cbf3f /Doc | |
| parent | e5d518f2526ab1008232767080b867cdb1eb052d (diff) | |
| download | cpython-611f8f5e8eb2742fd720dc0280e77b8d634639cb.zip cpython-611f8f5e8eb2742fd720dc0280e77b8d634639cb.tar.gz cpython-611f8f5e8eb2742fd720dc0280e77b8d634639cb.tar.bz2 | |
Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83352 | georg.brandl | 2010-07-31 20:11:07 +0200 (Sa, 31 Jul 2010) | 1 line
#9440: Remove borderline test case that fails based on unpredictable conditions such as compiler flags.
........
r83355 | georg.brandl | 2010-07-31 21:17:11 +0200 (Sa, 31 Jul 2010) | 1 line
Fix bad merge: test_support -> support.
........
r83356 | georg.brandl | 2010-07-31 21:29:15 +0200 (Sa, 31 Jul 2010) | 1 line
Remove trailing whitespace.
........
r83357 | georg.brandl | 2010-07-31 21:59:55 +0200 (Sa, 31 Jul 2010) | 1 line
#5778: document that sys.version can contain a newline.
........
r83358 | georg.brandl | 2010-07-31 22:05:31 +0200 (Sa, 31 Jul 2010) | 1 line
#9442: do not document a specific format for sys.version; rather refer to version_info and the platform module.
........
r83362 | georg.brandl | 2010-07-31 23:12:15 +0200 (Sa, 31 Jul 2010) | 1 line
#8910: add a file explaining why Lib/test/data is there.
........
r83366 | georg.brandl | 2010-07-31 23:26:40 +0200 (Sa, 31 Jul 2010) | 1 line
There always is a False and True now.
........
r83368 | georg.brandl | 2010-07-31 23:40:15 +0200 (Sa, 31 Jul 2010) | 1 line
#7909: the prefixes \\.\ and \\?\ indicate special Windows paths, do not try to manipulate them. See http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx for details.
........
r83369 | georg.brandl | 2010-07-31 23:41:42 +0200 (Sa, 31 Jul 2010) | 1 line
Fix "Berkeley" name.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/dbm.rst | 8 | ||||
| -rw-r--r-- | Doc/library/sys.rst | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst index bcb2378..b4fad45 100644 --- a/Doc/library/dbm.rst +++ b/Doc/library/dbm.rst @@ -5,10 +5,10 @@ :synopsis: Interfaces to various Unix "database" formats. :mod:`dbm` is a generic interface to variants of the DBM database --- - :mod:`dbm.gnu` or :mod:`dbm.ndbm`. If none of these modules is installed, the - slow-but-simple implementation in module :mod:`dbm.dumb` will be used. There - is a `third party interface <http://www.jcea.es/programacion/pybsddb.htm>`_ to - the Oracle Berkely DB. +:mod:`dbm.gnu` or :mod:`dbm.ndbm`. If none of these modules is installed, the +slow-but-simple implementation in module :mod:`dbm.dumb` will be used. There +is a `third party interface <http://www.jcea.es/programacion/pybsddb.htm>`_ to +the Oracle Berkeley DB. .. exception:: error diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 67f335b..4586793 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -853,14 +853,10 @@ always available. .. data:: version A string containing the version number of the Python interpreter plus additional - information on the build number and compiler used. It has a value of the form - ``'version (#build_number, build_date, build_time) [compiler]'``. The first - three characters are used to identify the version in the installation - directories (where appropriate on each platform). An example:: - - >>> import sys - >>> sys.version - '1.5.2 (#0 Apr 13 1999, 10:51:12) [MSC 32 bit (Intel)]' + information on the build number and compiler used. This string is displayed + when the interactive interpreter is started. Do not extract version information + out of it, rather, use :data:`version_info` and the functions provided by the + :mod:`platform` module. .. data:: api_version |