8000 #5624: _winreg is winreg in Python 3. · python/cpython@4ed72ac · GitHub
[go: up one dir, main page]
Skip to content

Commit 4ed72ac

Browse files
birkenfeldbirkenfeld
committed
#5624: _winreg is winreg in Python 3.
1 parent 99412e5 commit 4ed72ac

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

‎Lib/distutils/tests/test_msvc9compiler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def test_reg_class(self):
4848
v = Reg.get_value(path, "lfitalic")
4949
self.assert_(v in (0, 1))
5050

51-
import _winreg
52-
HKCU = _winreg.HKEY_CURRENT_USER
51+
import winreg
52+
HKCU = winreg.HKEY_CURRENT_USER
5353
keys = Reg.read_keys(HKCU, 'xxxx')
5454
self.assertEquals(keys, None)
5555

‎Lib/urllib/request.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,18 +2160,18 @@ def getproxies_registry():
21602160
"""
21612161
proxies = {}
21622162
try:
2163-
import _winreg
2163+
import winreg
21642164
except ImportError:
21652165
# Std module, so should be around - but you never know!
21662166
return proxies
21672167
try:
2168-
internetSettings = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
2168+
internetSettings = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
21692169
r'Software\Microsoft\Windows\CurrentVersion\Internet Settings')
2170-
proxyEnable = _winreg.QueryValueEx(internetSettings,
2170+
proxyEnable = winreg.QueryValueEx(internetSettings,
21712171
'ProxyEnable')[0]
21722172
if proxyEnable:
21732173
# Returned as Unicode but problems if not converted to ASCII
2174-
proxyServer = str(_winreg.QueryValueEx(internetSettings,
2174+
proxyServer = str(winreg.QueryValueEx(internetSettings,
21752175
'ProxyServer')[0])
21762176
if '=' in proxyServer:
21772177
# Per-protocol settings
@@ -2208,17 +2208,17 @@ def getproxies():
22082208

22092209
def proxy_bypass_registry(host):
22102210
try:
2211-
import _winreg
2211+
import winreg
22122212
import re
22132213
except ImportError:
22142214
# Std modules, so should be around - but you never know!
22152215
return 0
22162216
try:
2217-
internetSettings = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
2217+
internetSettings = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
22182218
r'Software\Microsoft\Windows\CurrentVersion\Internet Settings')
2219-
proxyEnable = _winreg.QueryValueEx(internetSettings,
2219+
proxyEnable = winreg.QueryValueEx(internetSettings,
22202220
'ProxyEnable')[0]
2221-
proxyOverride = str(_winreg.QueryValueEx(internetSettings,
2221+
proxyOverride = str(winreg.QueryValueEx(internetSettings,
22222222
'ProxyOverride')[0])
22232223
# ^^^^ Returned as Unicode but problems if not converted to ASCII
22242224
except WindowsError:

‎Misc/NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change 10476
@@ -53,6 +53,8 @@ Core and Builtins
5353
Library
5454
-------
5555

56+
- Issue #5624: Fix the _winreg module name still used in several modules.
57+
5658
- Issue #5628: Fix io.TextIOWrapper.read() with a unreadable buffer.
5759

5860
- Issue #5619: Multiprocessing children disobey the debug flag and causes

‎Tools/msi/msilib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import win32com.client
66
import pythoncom, pywintypes
77
from win32com.client import constants
8-
import re, string, os, sets, glob, subprocess, sys, _winreg, struct
8+
import re, string, os, sets, glob, subprocess, sys, winreg, struct
99

1010
try:
1111
basestring
@@ -387,9 +387,9 @@ def commit(self, db):
387387
(r"Software\Microsoft\Win32SDK\Directories", "Install Dir"),
388388
]:
389389
try:
390-
key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
391-
dir = _winreg.QueryValueEx(key, v)[0]
392-
_winreg.CloseKey(key)
390+
key = winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
391+
dir = winreg.QueryValueEx(key, v)[0]
392+
winreg.CloseKey(key)
393393
except (WindowsError, IndexError):
394394
continue
395395
cabarc = os.path.join(dir, r"Bin", "cabarc.exe")

0 commit comments

Comments
 (0)
0