require_owned -> restrict

ericsnowcurrently · ericsnowcurrently · commit 92c4f47864ec · 2024-04-10T17:36:34.000-06:00
diff --git a/Lib/test/support/interpreters/__init__.py b/Lib/test/support/interpreters/__init__.py
@@ -183,8 +183,7 @@ def whence(self):
 
     def is_running(self):
         """Return whether or not the identified interpreter is running."""
-        # require_owned is okay since this doesn't modify the interpreter.
-        return _interpreters.is_running(self._id, require_owned=False)
+        return _interpreters.is_running(self._id)
 
     # Everything past here is available only to interpreters created by
     # interpreters.create().
@@ -195,15 +194,15 @@ def close(self):
         Attempting to destroy the current interpreter results
         in an InterpreterError.
         """
-        return _interpreters.destroy(self._id, require_owned=True)
+        return _interpreters.destroy(self._id, restrict=True)
 
     def prepare_main(self, ns=None, /, **kwargs):
         """Bind the given values into the interpreter's __main__.
 
         The values must be shareable.
         """
         ns = dict(ns, **kwargs) if ns is not None else kwargs
-        _interpreters.set___main___attrs(self._id, ns, require_owned=True)
+        _interpreters.set___main___attrs(self._id, ns, restrict=True)
 
     def exec(self, code, /):
         """Run the given source code in the interpreter.
@@ -223,7 +222,7 @@ def exec(self, code, /):
         that time, the previous interpreter is allowed to run
         in other threads.
         """
-        excinfo = _interpreters.exec(self._id, code, require_owned=True)
+        excinfo = _interpreters.exec(self._id, code, restrict=True)
         if excinfo is not None:
             raise ExecutionFailed(excinfo)
 
@@ -243,7 +242,7 @@ def call(self, callable, /):
         # XXX Support args and kwargs.
         # XXX Support arbitrary callables.
         # XXX Support returning the return value (e.g. via pickle).
-        excinfo = _interpreters.call(self._id, callable, require_owned=True)
+        excinfo = _interpreters.call(self._id, callable, restrict=True)
         if excinfo is not None:
             raise ExecutionFailed(excinfo)
 
diff --git a/Lib/test/test_interpreters/test_api.py b/Lib/test/test_interpreters/test_api.py
@@ -1443,7 +1443,7 @@ def test_destroy(self):
         with self.subTest('from C-API'):
             interpid = _testinternalcapi.create_interpreter()
             with self.assertRaisesRegex(InterpreterError, 'unrecognized'):
-                _interpreters.destroy(interpid, require_owned=True)
+                _interpreters.destroy(interpid, restrict=True)
             self.assertTrue(
                 self.interp_exists(interpid))
             _interpreters.destroy(interpid)
@@ -1477,7 +1477,7 @@ def test_get_config(self):
             orig = _interpreters.new_config('isolated')
             with self.interpreter_from_capi(orig) as interpid:
                 with self.assertRaisesRegex(InterpreterError, 'unrecognized'):
-                    _interpreters.get_config(interpid, require_owned=True)
+                    _interpreters.get_config(interpid, restrict=True)
                 config = _interpreters.get_config(interpid)
             self.assert_ns_equal(config, orig)
 
@@ -1528,7 +1528,7 @@ def test_whence(self):
     def test_is_running(self):
         def check(interpid, expected):
             with self.assertRaisesRegex(InterpreterError, 'unrecognized'):
-                _interpreters.is_running(interpid, require_owned=True)
+                _interpreters.is_running(interpid, restrict=True)
             running = _interpreters.is_running(interpid)
             self.assertIs(running, expected)
 
@@ -1598,7 +1598,7 @@ def test_exec(self):
             with self.interpreter_from_capi() as interpid:
                 with self.assertRaisesRegex(InterpreterError, 'unrecognized'):
                     _interpreters.exec(interpid, 'raise Exception("it worked!")',
-                                       require_owned=True)
+                                       restrict=True)
                 exc = _interpreters.exec(interpid, 'raise Exception("it worked!")')
             self.assertIsNot(exc, None)
             self.assertEqual(exc.msg, 'it worked!')
@@ -1648,7 +1648,7 @@ def test_set___main___attrs(self):
             with self.interpreter_from_capi() as interpid:
                 with self.assertRaisesRegex(InterpreterError, 'unrecognized'):
                     _interpreters.set___main___attrs(interpid, {'spam': True},
-                                                     require_owned=True)
+                                                     restrict=True)
                 _interpreters.set___main___attrs(interpid, {'spam': True})
                 rc = _testinternalcapi.exec_interpreter(
                     interpid,
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
