Skip to content

[3.10] bpo-45382: test.pythoninfo logs more Windows versions #30891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Jan 25, 2022
Merged

[3.10] bpo-45382: test.pythoninfo logs more Windows versions #30891

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8413760
bpo-45382: test.pythoninfo logs more Windows versions (GH-30817)
vstinner Jan 23, 2022
bd0673b
bpo-45382: test.pythoninfo: set wmic.exe encoding to OEM (GH-30890)
vstinner Jan 25, 2022
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
Next Next commit
bpo-45382: test.pythoninfo logs more Windows versions (GH-30817) 
Add the following info to test.pythoninfo:

* windows.ver: output of the shell "ver" command
* windows.version and windows.version_caption: output of the
  "wmic os get Caption,Version /value" command.

(cherry picked from commit b0898f4)
  • Loading branch information
@vstinner
vstinner committed Jan 25, 2022
commit 8413760d67ef0762466c895e37774b328012d93f
39 changes: 39 additions & 0 deletions Lib/test/pythoninfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,45 @@ def collect_windows(info_add):
except (ImportError, AttributeError):
pass

import subprocess
try:
proc = subprocess.Popen(["wmic", "os", "get", "Caption,Version", "/value"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True)
output, stderr = proc.communicate()
if proc.returncode:
output = ""
except OSError:
pass
else:
for line in output.splitlines():
line = line.strip()
if line.startswith('Caption='):
line = line.removeprefix('Caption=').strip()
if line:
info_add('windows.version_caption', line)
elif line.startswith('Version='):
line = line.removeprefix('Version=').strip()
if line:
info_add('windows.version', line)

try:
proc = subprocess.Popen(["ver"], shell=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True)
output = proc.communicate()[0]
if proc.returncode:
output = ""
except OSError:
return
else:
output = output.strip()
line = output.splitlines()[0]
if line:
info_add('windows.ver', line)


def collect_fips(info_add):
try:
Expand Down