[pypy-commit] pypy py3.6-sandbox-2: More sandbox_reviews

arigo pypy.commits at gmail.com
Tue Aug 27 06:03:44 EDT 2019


Author: Armin Rigo <arigo at tunes.org>
Branch: py3.6-sandbox-2
Changeset: r97300:6dcefdad5651
Date: 2019-08-27 11:27 +0200
http://bitbucket.org/pypy/pypy/changeset/6dcefdad5651/

Log:	More sandbox_reviews

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -10,7 +10,7 @@
 
 from rpython.rlib import rposix, rposix_stat, rfile
 from rpython.rlib import objectmodel, rurandom
-from rpython.rlib.objectmodel import specialize, not_rpython
+from rpython.rlib.objectmodel import specialize, not_rpython, sandbox_review
 from rpython.rlib.rarithmetic import r_longlong, intmask, r_uint, r_int
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.rtyper.lltypesystem import lltype
@@ -2432,6 +2432,7 @@
 if _WIN32:
     have_functions.append("HAVE_MS_WINDOWS")
 
+ at sandbox_review(reviewed=True)
 def _get_terminal_size(space, w_fd=None):
     if w_fd is None:
         fd = rfile.RFile(rfile.c_stdout(), close2=(None, None)).fileno()
diff --git a/pypy/module/posix/interp_scandir.py b/pypy/module/posix/interp_scandir.py
--- a/pypy/module/posix/interp_scandir.py
+++ b/pypy/module/posix/interp_scandir.py
@@ -2,6 +2,7 @@
 from errno import ENOENT
 from rpython.rlib import rgc
 from rpython.rlib import rposix, rposix_scandir, rposix_stat
+from rpython.rlib.objectmodel import sandbox_review
 
 from pypy.interpreter.gateway import unwrap_spec, WrappedDefault, interp2app
 from pypy.interpreter.error import OperationError, oefmt, wrap_oserror2
@@ -11,6 +12,7 @@
 from pypy.module.posix.interp_posix import unwrap_fd, build_stat_result, _WIN32
 
 
+ at sandbox_review(reviewed=True)
 def scandir(space, w_path=None):
     "scandir(path='.') -> iterator of DirEntry objects for given path"
     if space.is_none(w_path):
@@ -78,6 +80,7 @@
                 e.write_unraisable(space, '', self)
         self._close()
 
+    @sandbox_review(reviewed=True)
     def _close(self):
         dirp = self.dirp
         if dirp:
@@ -87,6 +90,7 @@
     def iter_w(self):
         return self
 
+    @sandbox_review(reviewed=True)
     def fail(self, err=None):
         dirp = self.dirp
         if dirp:
@@ -98,6 +102,7 @@
         else:
             raise err
 
+    @sandbox_review(reviewed=True)
     def next_w(self):
         if not self.dirp:
             raise self.fail()
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
@@ -286,6 +286,7 @@
         else:
             c_gettimeofday = external('gettimeofday',
                                       [lltype.Ptr(TIMEVAL), rffi.VOIDP], rffi.INT)
+    @sandbox_review(reviewed=True)
     def gettimeofday(space, w_info=None):
         if HAVE_GETTIMEOFDAY:
             with lltype.scoped_alloc(TIMEVAL) as timeval:
@@ -662,6 +663,7 @@
     if not 0 <= rffi.getintfield(t_ref, 'c_tm_yday') <= 365:
         raise oefmt(space.w_ValueError, "day of year out of range")
 
+ at sandbox_review(reviewed=True)
 def time(space, w_info=None):
     """time() -> floating point number
 
@@ -792,6 +794,7 @@
     def _timespec_to_seconds(timespec):
         return widen(timespec.c_tv_sec) + widen(timespec.c_tv_nsec) * 1e-9
 
+    @sandbox_review(reviewed=True)
     @unwrap_spec(clk_id='c_int')
     def clock_gettime(space, clk_id):
         with lltype.scoped_alloc(TIMESPEC) as timespec:
@@ -813,6 +816,7 @@
             if ret != 0:
                 raise exception_from_saved_errno(space, space.w_OSError)
 
+    @sandbox_review(reviewed=True)
     @unwrap_spec(clk_id='c_int')
     def clock_getres(space, clk_id):
         with lltype.scoped_alloc(TIMESPEC) as timespec:
@@ -955,6 +959,7 @@
 
     else:
         assert _POSIX
+        @sandbox_review(reviewed=True)
         def monotonic(space, w_info=None):
             if rtime.CLOCK_HIGHRES is not None:
                 clk_id = rtime.CLOCK_HIGHRES
@@ -1045,6 +1050,7 @@
 else:
     have_times = hasattr(rposix, 'c_times')
 
+    @sandbox_review(reviewed=True)
     def process_time(space, w_info=None):
         if HAS_CLOCK_GETTIME and (
                 rtime.CLOCK_PROF is not None or


More information about the pypy-commit mailing list