Skip to content
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

fix: undefined variable on Windows if scope != user #392

Merged
merged 4 commits into from
Jan 4, 2024
Merged

fix: undefined variable on Windows if scope != user #392

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c6df63
fix: undefined variable on Windows if scope != user
Guts Jan 4, 2024
cee2202
fix: unused pass
Guts Jan 4, 2024
1f4882d
fix: use _ to assign an unused var
Guts Jan 4, 2024
ba9d090
fix: rename var to match Python naming conventions
Guts Jan 4, 2024
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
18 changes: 9 additions & 9 deletions qgis_deployment_toolbelt/utils/win32utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
# Imports depending on operating system
if opersys == "win32":
"""windows"""

# standard
import winreg

# 3rd party
import win32gui
else:
pass


# #############################################################################
Expand Down Expand Up @@ -63,7 +62,7 @@ def delete_environment_variable(envvar_name: str, scope: str = "user") -> bool:
if scope == "user":
hkey = user_hkey
else:
system_hkey
hkey = system_hkey

# get it to check if variable exits
try:
Expand Down Expand Up @@ -98,11 +97,12 @@ def get_environment_variable(envvar_name: str, scope: str = "user") -> str | Non
if scope == "user":
hkey = user_hkey
else:
system_hkey
hkey = system_hkey

# try to get the value
try:
with winreg.OpenKey(*hkey, access=winreg.KEY_READ) as key:
value, regtype = winreg.QueryValueEx(key, envvar_name)
value, _ = winreg.QueryValueEx(key, envvar_name)
return value
except OSError:
logger.error(
Expand Down Expand Up @@ -149,12 +149,12 @@ def refresh_environment() -> bool:
HWND_BROADCAST: int = 0xFFFF
WM_SETTINGCHANGE: int = 0x001A
SMTO_ABORTIFHUNG: int = 0x0002
sParam = "Environment"
send_parameter = "Environment"

res1 = res2 = None
try:
res1, res2 = win32gui.SendMessageTimeout(
HWND_BROADCAST, WM_SETTINGCHANGE, 0, sParam, SMTO_ABORTIFHUNG, 100
HWND_BROADCAST, WM_SETTINGCHANGE, 0, send_parameter, SMTO_ABORTIFHUNG, 100
)
except NameError:
logger.critical(" name 'win32gui' is not defined")
Expand Down Expand Up @@ -185,7 +185,7 @@ def set_environment_variable(
if scope == "user":
hkey = user_hkey
else:
system_hkey
hkey = system_hkey

# try to set the value
try:
Expand Down