summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorslateny <46876382+slateny@users.noreply.github.com>2022-04-20 16:23:40 (GMT)
committerGitHub <noreply@github.com>2022-04-20 16:23:40 (GMT)
commitad3ca17ff5cd63f907430073b52be27695674148 (patch)
tree282dad7cfa735919d8fe80ce49ee741ba20c7181 /Doc
parentd7d7e6c00778d234fda2c2229faccec5e8f48643 (diff)
downloadcpython-ad3ca17ff5cd63f907430073b52be27695674148.zip
cpython-ad3ca17ff5cd63f907430073b52be27695674148.tar.gz
cpython-ad3ca17ff5cd63f907430073b52be27695674148.tar.bz2
bpo-23747: Enhance platform doc, document default behavior (GH-31462)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/platform.rst14
1 files changed, 8 insertions, 6 deletions
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index a0eece6..346063d 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -139,7 +139,7 @@ Cross Platform
.. function:: release()
- Returns the system's release, e.g. ``'2.2.0'`` or ``'NT'`` An empty string is
+ Returns the system's release, e.g. ``'2.2.0'`` or ``'NT'``. An empty string is
returned if the value cannot be determined.
@@ -176,7 +176,7 @@ Cross Platform
Entries which cannot be determined are set to ``''``.
.. versionchanged:: 3.3
- Result changed from a tuple to a namedtuple.
+ Result changed from a tuple to a :func:`~collections.namedtuple`.
Java Platform
@@ -201,7 +201,9 @@ Windows Platform
Get additional version information from the Windows Registry and return a tuple
``(release, version, csd, ptype)`` referring to OS release, version number,
- CSD level (service pack) and OS type (multi/single processor).
+ CSD level (service pack) and OS type (multi/single processor). Values which
+ cannot be determined are set to the defaults given as parameters (which all
+ default to an empty string).
As a hint: *ptype* is ``'Uniprocessor Free'`` on single processor NT machines
and ``'Multiprocessor Free'`` on multi processor machines. The *'Free'* refers
@@ -211,9 +213,9 @@ Windows Platform
.. function:: win32_edition()
- Returns a string representing the current Windows edition. Possible
- values include but are not limited to ``'Enterprise'``, ``'IoTUAP'``,
- ``'ServerStandard'``, and ``'nanoserver'``.
+ Returns a string representing the current Windows edition, or ``None`` if the
+ value cannot be determined. Possible values include but are not limited to
+ ``'Enterprise'``, ``'IoTUAP'``, ``'ServerStandard'``, and ``'nanoserver'``.
.. versionadded:: 3.8