Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions Lib/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,8 @@ class uname_result(
except when needed.
"""

_fields = ('system', 'node', 'release', 'version', 'machine', 'processor')

@functools.cached_property
def processor(self):
return _unknown_as_blank(_Processor.get())
Expand All @@ -789,7 +791,7 @@ def __iter__(self):
@classmethod
def _make(cls, iterable):
# override factory to affect length check
num_fields = len(cls._fields)
num_fields = len(cls._fields) - 1
result = cls.__new__(cls, *iterable)
if len(result) != num_fields + 1:
msg = f'Expected {num_fields} arguments, got {len(result)}'
Expand All @@ -803,7 +805,7 @@ def __len__(self):
return len(tuple(iter(self)))

def __reduce__(self):
return uname_result, tuple(self)[:len(self._fields)]
return uname_result, tuple(self)[:len(self._fields) - 1]


_uname_cache = None
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ def test_uname_slices(self):
self.assertEqual(res[:], expected)
self.assertEqual(res[:5], expected[:5])

def test_uname_fields(self):
self.assertIn('processor', platform.uname()._fields)

def test_uname_asdict(self):
res = platform.uname()._asdict()
self.assertEqual(len(res), 6)
self.assertIn('processor', res)

@unittest.skipIf(sys.platform in ['win32', 'OpenVMS'], "uname -p not used")
def test_uname_processor(self):
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
On ``uname_result``, restored expectation that ``_fields`` and ``_asdict``
would include all six properties including ``processor``.