bpo-30374: Fixed several bugs in win_add2path.py #1645
+40
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Discard the DEFAULT "%PATH%" value. * Delete wrong `os.path.isdir()`. * Add absolute path instead of `%APPDATA%...` if the type of PATH is `REG_SZ`. * Broadcast a `WM_SETTINGCHANG` message after the change of env vars. * Add codes to deal with possible errors.
|
@neEverett, thanks for your PR! By analyzing the history of the files in this pull request, we identified @benjaminp, @tiran and @birkenfeld to be potential reviewers. |
zooba
reviewed
Feb 2, 2019
Thanks for this! Overall they are good looking changes, just a few loose ends to tidy up.
Tools/scripts/win_add2path.py
Outdated
| @@ -11,43 +11,67 @@ | |||
| import site | |||
| import os | |||
| import winreg | |||
| import ctypes | |||
Tools/scripts/win_add2path.py
Outdated
| envpath, dtype = winreg.QueryValueEx(key, PATH) | ||
| except FileNotFoundError: | ||
| envpath, dtype = "", winreg.REG_EXPAND_SZ | ||
| pass |
Tools/scripts/win_add2path.py
Outdated
| except: | ||
| raise OSError("Failed to load PATH value") | ||
|
|
||
| if hasattr(site, "USER_SITE") and dtype == winreg.REG_EXPAND_SZ: |
There was a problem hiding this comment.
This hasattr check doesn't apply to the subsequent elif block, or rather, if the first check here fails then we may end up crashing in the elif block.
Fixed the problems mentioned here: python#1645
Fixed the problems mentioned here: python#1645
|
Closing and reopening to retrigger tests. |
|
This PR is stale because it has been open for 30 days with no activity. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
DEFAULT = "%PATH%". The system PATH is effective to all users[1] so adding "%PATH%" in user PATH is unnecessary.os.path.isdir()always return False because the input path includes"%APPDATA%"and also because the USER_SITE directory does not yet exist when Python is just installed. It is now deleted to make paths be added correctly."%APPDATA%"effective[2] . However this is not a good practice (brought forward by Eryk Sun in the issue). Now the script does not change the type of PATH. If it's REG_SZ, the absolute path of%APPDATA%will be added instead.WM_SETTINGCHANGmessage[3] after the change of env vars.https://bugs.python.org/issue30374