summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-09-04 06:35:54 (GMT)
committerGeorg Brandl <georg@python.org>2011-09-04 06:35:54 (GMT)
commit3484a8771c7e4f8da65960d32c25071432f8afd3 (patch)
treeea586dacd5e2ed1315932d6a645383de30d70237 /Doc/library
parente3bb2cfb7ad8325dbf98312592221efc6e7625f2 (diff)
parentd42b7a332c40a54d1fe0a9b8a5b9f8d419c6bb90 (diff)
downloadcpython-3484a8771c7e4f8da65960d32c25071432f8afd3.zip
cpython-3484a8771c7e4f8da65960d32c25071432f8afd3.tar.gz
cpython-3484a8771c7e4f8da65960d32c25071432f8afd3.tar.bz2
Merge with release clone.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/sys.rst42
1 files changed, 26 insertions, 16 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 7d631f4..7f3d827 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -699,26 +699,36 @@ always available.
This string contains a platform identifier that can be used to append
platform-specific components to :data:`sys.path`, for instance.
- For Unix systems, this is the lowercased OS name as returned by ``uname -s``
- with the first part of the version as returned by ``uname -r`` appended,
- e.g. ``'sunos5'`` or ``'linux2'``, *at the time when Python was built*.
- Unless you want to test for a specific system version, it is therefore
- recommended to use the following idiom::
-
- if sys.platform.startswith('linux'):
+ For most Unix systems, this is the lowercased OS name as returned by ``uname
+ -s`` with the first part of the version as returned by ``uname -r`` appended,
+ e.g. ``'sunos5'``, *at the time when Python was built*. Unless you want to
+ test for a specific system version, it is therefore recommended to use the
+ following idiom::
+
+ if sys.platform.startswith('freebsd'):
+ # FreeBSD-specific code here...
+ elif sys.platform.startswith('linux'):
# Linux-specific code here...
+ .. versionchanged:: 3.2.2
+ Since lots of code check for ``sys.platform == 'linux2'``, and there is
+ no essential change between Linux 2.x and 3.x, ``sys.platform`` is always
+ set to ``'linux2'``, even on Linux 3.x. In Python 3.3 and later, the
+ value will always be set to ``'linux'``, so it is recommended to always
+ use the ``startswith`` idiom presented above.
+
For other systems, the values are:
- ================ ===========================
- System :data:`platform` value
- ================ ===========================
- Windows ``'win32'``
- Windows/Cygwin ``'cygwin'``
- Mac OS X ``'darwin'``
- OS/2 ``'os2'``
- OS/2 EMX ``'os2emx'``
- ================ ===========================
+ ====================== ===========================
+ System :data:`platform` value
+ ====================== ===========================
+ Linux (2.x *and* 3.x) ``'linux2'``
+ Windows ``'win32'``
+ Windows/Cygwin ``'cygwin'``
+ Mac OS X ``'darwin'``
+ OS/2 ``'os2'``
+ OS/2 EMX ``'os2emx'``
+ ====================== ===========================
.. seealso::
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives