gh-97966: Restore prior expectation that uname_result._fields and ._asdict would include the processor. (gh-98343)

This commit is contained in:
Jason R. Coombs 2022-11-26 08:28:49 -05:00 committed by GitHub
parent e35ca417fe
commit dc063a25d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions

View file

@ -847,6 +847,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())
@ -860,7 +862,7 @@ class uname_result(
@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)}'
@ -874,7 +876,7 @@ class uname_result(
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