Merge 3.3
This commit is contained in:
commit
4482b01d23
|
@ -323,6 +323,18 @@ class LocalWinregTests(BaseWinregTests):
|
|||
finally:
|
||||
DeleteKey(HKEY_CURRENT_USER, test_key_name)
|
||||
|
||||
def test_setvalueex_value_range(self):
|
||||
# Test for Issue #14420, accept proper ranges for SetValueEx.
|
||||
# Py2Reg, which gets called by SetValueEx, was using PyLong_AsLong,
|
||||
# thus raising OverflowError. The implementation now uses
|
||||
# PyLong_AsUnsignedLong to match DWORD's size.
|
||||
try:
|
||||
with CreateKey(HKEY_CURRENT_USER, test_key_name) as ck:
|
||||
self.assertNotEqual(ck.handle, 0)
|
||||
SetValueEx(ck, "test_name", None, REG_DWORD, 0x80000000)
|
||||
finally:
|
||||
DeleteKey(HKEY_CURRENT_USER, test_key_name)
|
||||
|
||||
|
||||
@unittest.skipUnless(REMOTE_NAME, "Skipping remote registry tests")
|
||||
class RemoteWinregTests(BaseWinregTests):
|
||||
|
|
|
@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #14420: Support the full DWORD (unsigned long) range in Py2Reg
|
||||
when passed a REG_DWORD value. Fixes OverflowError in winreg.SetValueEx.
|
||||
|
||||
- Issue #11939: Set the st_dev attribute of stat_result to allow Windows to
|
||||
take advantage of the os.path.samefile/sameopenfile/samestat implementations
|
||||
used by other platforms.
|
||||
|
|
|
@ -785,7 +785,7 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize)
|
|||
memcpy(*retDataBuf, &zero, sizeof(DWORD));
|
||||
}
|
||||
else {
|
||||
DWORD d = PyLong_AsLong(value);
|
||||
DWORD d = PyLong_AsUnsignedLong(value);
|
||||
memcpy(*retDataBuf, &d, sizeof(DWORD));
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue