Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Doc/library/platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down