Mercurial > hg
changeset 24418:a2285e2fc949 stable
win32: 'raise ctypes.WinError' -> 'raise ctypes.WinError()'
WinError is a function that creates an Error, not an Error itself. This is a
partial backout of e34106fa0dc3.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 22 Mar 2015 19:08:13 -0400 |
| parents | 9372180b8c9b |
| children | 8e477ad46692 e810c7da1cae |
| files | mercurial/win32.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/win32.py Fri Mar 20 00:30:35 2015 -0700 +++ b/mercurial/win32.py Sun Mar 22 19:08:13 2015 -0400 @@ -279,7 +279,7 @@ buf = ctypes.create_string_buffer(size + 1) len = _kernel32.GetModuleFileNameA(None, ctypes.byref(buf), size) if len == 0: - raise ctypes.WinError + raise ctypes.WinError() elif len == size: raise ctypes.WinError(_ERROR_INSUFFICIENT_BUFFER) return buf.value @@ -289,7 +289,7 @@ size = _DWORD(300) buf = ctypes.create_string_buffer(size.value + 1) if not _advapi32.GetUserNameA(ctypes.byref(buf), ctypes.byref(size)): - raise ctypes.WinError + raise ctypes.WinError() return buf.value _signalhandler = [] @@ -307,7 +307,7 @@ h = _SIGNAL_HANDLER(handler) _signalhandler.append(h) # needed to prevent garbage collection if not _kernel32.SetConsoleCtrlHandler(h, True): - raise ctypes.WinError + raise ctypes.WinError() def hidewindow(): @@ -349,7 +349,7 @@ # create handle to list all processes ph = _kernel32.CreateToolhelp32Snapshot(_TH32CS_SNAPPROCESS, 0) if ph == _INVALID_HANDLE_VALUE: - raise ctypes.WinError + raise ctypes.WinError() try: r = _kernel32.Process32First(ph, ctypes.byref(pe)) # loop over all processes @@ -361,7 +361,7 @@ finally: _kernel32.CloseHandle(ph) if _kernel32.GetLastError() != _ERROR_NO_MORE_FILES: - raise ctypes.WinError + raise ctypes.WinError() return None # no child found class _tochildpid(int): # pid is _DWORD, which always matches in an int @@ -413,7 +413,7 @@ None, args, None, None, False, _CREATE_NO_WINDOW, env, os.getcwd(), ctypes.byref(si), ctypes.byref(pi)) if not res: - raise ctypes.WinError + raise ctypes.WinError() # _tochildpid because the process is the child of COMSPEC return _tochildpid(pi.dwProcessId)