Skip to content

Commit 2476112

Browse files
committed
Move member descriptions into result definition
1 parent 943b5d8 commit 2476112

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

Doc/library/os.rst

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -803,17 +803,6 @@ process and user.
803803
The return value is a :class:`uname_result` object. These attributes
804804
correspond to the members described in :manpage:`uname(2)`.
805805

806-
For backwards compatibility, this object is also iterable, behaving
807-
like a five-tuple containing :attr:`~uname_result.sysname`,
808-
:attr:`~uname_result.nodename`, :attr:`~uname_result.release`,
809-
:attr:`~uname_result.version`, and :attr:`~uname_result.machine`
810-
in that order.
811-
812-
Some systems truncate :attr:`~uname_result.nodename` to 8 characters or to the
813-
leading component; a better way to get the hostname is
814-
:func:`socket.gethostname` or even
815-
``socket.gethostbyaddr(socket.gethostname())``.
816-
817806
On macOS, iOS and Android, this returns the *kernel* name and version (i.e.,
818807
``'Darwin'`` on macOS and iOS; ``'Linux'`` on Android). :func:`platform.uname`
819808
can be used to get the user-facing operating system name and version on iOS and
@@ -836,13 +825,22 @@ process and user.
836825

837826
Name and information about the system returned by :func:`os.uname`.
838827

828+
For backwards compatibility, this object is also iterable, behaving
829+
like a five-tuple containing :attr:`~uname_result.sysname`,
830+
:attr:`~uname_result.nodename`, :attr:`~uname_result.release`,
831+
:attr:`~uname_result.version`, and :attr:`~uname_result.machine`
832+
in that order.
833+
839834
.. attribute:: sysname
840835

841836
Operating system name.
842837

843838
.. attribute:: nodename
844839

845-
Name of machine on network (implementation-defined).
840+
Name of machine on network. Some systems truncate
841+
:attr:`~uname_result.nodename` to 8 characters or to the leading
842+
component; a better way to get the hostname is :func:`socket.gethostname`
843+
or even ``socket.gethostbyaddr(socket.gethostname())``.
846844

847845
.. attribute:: release
848846

0 commit comments

Comments
 (0)