Skip to content

gh-112278: reduce time cost for platform module when no permission to WMI on Windows #112658

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
zooba merged 6 commits into from
Dec 7, 2023
Merged

gh-112278: reduce time cost for platform module when no permission to WMI on Windows #112658

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d24810
using an event object to simulate timeout for _wmi.exec_query
aisk Dec 3, 2023
d1630d1
change the _wmi_query implementation to dummy if it failed first time
aisk Dec 3, 2023
497b14a
Update PC/_wmimodule.cpp
aisk Dec 5, 2023
f1ee797
refactor _wmi_query to handle unsupport condition
aisk Dec 5, 2023
2a1ac5a
fix global _wmi declaration
aisk Dec 5, 2023
da0ddb1
handle SetEvent error
aisk Dec 5, 2023
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
Prev Previous commit
Next Next commit
change the _wmi_query implementation to dummy if it failed first time
  • Loading branch information
@aisk
aisk committed Dec 3, 2023
commit d1630d1dd9cac9ba57f1fe3ab9a29111efd9ecb6
16 changes: 11 additions & 5 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,18 +315,24 @@ def _syscmd_ver(system='', release='', version='',
try:
import _wmi
except ImportError:
def _wmi_query(*keys):
def _wmi_query(table, *keys):
raise OSError("not supported")
else:
def _wmi_query(table, *keys):
table = {
"OS": "Win32_OperatingSystem",
"CPU": "Win32_Processor",
}[table]
data = _wmi.exec_query("SELECT {} FROM {}".format(
",".join(keys),
table,
)).split("\0")
try:
data = _wmi.exec_query("SELECT {} FROM {}".format(
",".join(keys),
table,
)).split("\0")
except OSError:
global _wmi_query
def _wmi_query(table, *keys):
raise OSError("not supported")
raise OSError("not supported")
Copy link
Copy Markdown
Member

@zooba zooba Dec 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's restructure this import block to make _wmi = None when it fails to import, and then if we fail to query it can clear out _wmi and subsequent calls will act as if it were never imported.

split_data = (i.partition("=") for i in data)
dict_data = {i[0]: i[2] for i in split_data}
return (dict_data[k] for k in keys)
Expand Down