Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3.5
Changeset: r90897:3a59893aaaba
Date: 2017-04-01 18:19 +0200
http://bitbucket.org/pypy/pypy/changeset/3a59893aaaba/
Log: wrap_windowserror can be replaced by wrap_oserror, everywhere.
diff --git a/pypy/module/_multiprocessing/interp_win32.py
b/pypy/module/_multiprocessing/interp_win32.py
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ b/pypy/module/_multiprocessing/interp_win32.py
@@ -4,7 +4,7 @@
from rpython.rtyper.tool import rffi_platform
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.interpreter.error import oefmt, wrap_windowserror
+from pypy.interpreter.error import oefmt, wrap_oserror
from pypy.interpreter.function import StaticMethod
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.module._multiprocessing.interp_connection import w_handle
@@ -106,7 +106,7 @@
def CloseHandle(space, w_handle):
handle = handle_w(space, w_handle)
if not rwin32.CloseHandle(handle):
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
def GetLastError(space):
return space.newint(rwin32.GetLastError_saved())
@@ -126,7 +126,7 @@
outputsize, inputsize, timeout, rffi.NULL)
if handle == rwin32.INVALID_HANDLE_VALUE:
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
return w_handle(space, handle)
@@ -136,7 +136,7 @@
if overlapped:
raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
if not _ConnectNamedPipe(handle, rffi.NULL):
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
def SetNamedPipeHandleState(space, w_handle, w_pipemode, w_maxinstances,
w_timeout):
@@ -156,7 +156,7 @@
statep[2] = rffi.ptradd(state, 2)
if not _SetNamedPipeHandleState(handle, statep[0], statep[1],
statep[2]):
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
finally:
lltype.free(state, flavor='raw')
lltype.free(statep, flavor='raw')
@@ -165,7 +165,7 @@
def WaitNamedPipe(space, name, timeout):
# Careful: zero means "default value specified by CreateNamedPipe()"
if not _WaitNamedPipe(name, timeout):
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
@unwrap_spec(filename='fsencode', access=r_uint, share=r_uint,
disposition=r_uint, flags=r_uint)
@@ -180,7 +180,7 @@
disposition, flags, rwin32.NULL_HANDLE)
if handle == rwin32.INVALID_HANDLE_VALUE:
- raise wrap_windowserror(space, rwin32.lastSavedWindowsError())
+ raise wrap_oserror(space, rwin32.lastSavedWindowsError())
return w_handle(space, handle)
diff --git a/pypy/module/_winreg/interp_winreg.py
b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
+++ b/pypy/module/_winreg/interp_winreg.py
@@ -2,7 +2,7 @@
from pypy.interpreter.baseobjspace import W_Root, BufferInterfaceNotFound
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.interpreter.typedef import TypeDef, GetSetProperty
-from pypy.interpreter.error import OperationError, oefmt, wrap_windowserror
+from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
from rpython.rtyper.lltypesystem import rffi, lltype
from rpython.rlib import rwinreg, rwin32
from rpython.rlib.rarithmetic import r_uint, intmask
@@ -702,7 +702,7 @@
try:
return space.newunicode(rwinreg.ExpandEnvironmentStrings(source))
except WindowsError as e:
- raise wrap_windowserror(space, e)
+ raise wrap_oserror(space, e)
def DisableReflectionKey(space, w_key):
"""Disables registry reflection for 32-bit processes running on a 64-bit
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -39,7 +39,7 @@
# timeout. On Ctrl-C, the signal handler is called, the event is set,
# and the wait function exits.
from rpython.rlib import rwin32
- from pypy.interpreter.error import wrap_windowserror, wrap_oserror
+ from pypy.interpreter.error import wrap_oserror
from rpython.rlib import rthread as thread
eci = ExternalCompilationInfo(
@@ -101,9 +101,9 @@
globalState.interrupt_event = rwin32.CreateEvent(
rffi.NULL, True, False, rffi.NULL)
except WindowsError as e:
- raise wrap_windowserror(space, e)
+ raise wrap_oserror(space, e)
if not _setCtrlHandlerRoutine(globalState.interrupt_event):
- raise wrap_windowserror(space,
+ raise wrap_oserror(space,
rwin32.lastSavedWindowsError("SetConsoleCtrlHandler"))
globalState = GlobalState()
@@ -911,7 +911,7 @@
is_time_adjustment_disabled)
if not ok:
# Is this right? Cargo culting...
- raise wrap_windowserror(space,
+ raise wrap_oserror(space,
rwin32.lastSavedWindowsError("GetSystemTimeAdjustment"))
resolution = resolution * time_increment[0]
_setinfo(space, w_info, implementation, resolution, True,
False)
@@ -1020,7 +1020,7 @@
worked = GetProcessTimes(current_process, creation_time, exit_time,
kernel_time, user_time)
if not worked:
- raise wrap_windowserror(space,
+ raise wrap_oserror(space,
rwin32.lastSavedWindowsError("GetProcessTimes"))
kernel_time2 = (kernel_time.c_dwLowDateTime |
r_ulonglong(kernel_time.c_dwHighDateTime) << 32)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
