8000 Interpreter.exec_sync() -> exec(). · python/cpython@52cfcfb · GitHub
[go: up one dir, main page]
Skip to content

Commit 52cfcfb

Browse files
ericsnowcurrentlyericsnowcurrently
committed
Interpreter.exec_sync() -> exec().
1 parent 1e6b6d2 commit 52cfcfb

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎Lib/test/support/interpreters/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def prepare_main(self, ns=None, /, **kwargs):
158158
ns = dict(ns, **kwargs) if ns is not None else kwargs
159159
_interpreters.set___main___attrs(self._id, ns)
160160

161-
def exec_sync(self, code, /):
161+
def exec(self, code, /):
162162
"""Run the given source code in the interpreter.
163163
164164
This is essentially the same as calling the builtin "exec"
@@ -182,7 +182,7 @@ def exec_sync(self, code, /):
182182

183183
def run(self, code, /):
184184
def task():
185-
self.exec_sync(code)
185+
self.exec(code)
186186
t = threading.Thread(target=task)
187187
t.start()
188188
return t

‎Lib/test/test_interpreters/test_api.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def test_subinterpreter(self):
280280
def test_finished(self):
281281
r, w = self.pipe()
282282
interp = interpreters.create()
283-
interp.exec_sync(f"""if True:
283+
interp.exec(f"""if True:
284284
import os
285285
os.write({w}, b'x')
286286
""")
@@ -312,7 +312,7 @@ def test_with_only_background_threads(self):
312312
FINISHED = b'F'
313313

314314
interp = interpreters.create()
315-
interp.exec_sync(f"""if True:
315+
interp.exec(f"""if True:
316316
import os
317317
import threading
318318
@@ -326,7 +326,7 @@ def task():
326326
self.assertFalse(interp.is_running())
327327

328328
os.write(w_thread, DONE)
329-
interp.exec_sync('t.join()')
329+
interp.exec('t.join()')
330330
self.assertEqual(os.read(r_interp, 1), FINISHED)
331331

332332

@@ -393,7 +393,7 @@ def test_from_sibling(self):
393393
interp2 = interpreters.create()
394394
self.assertEqual(set(interpreters.list_all()),
395395
{main, interp1, interp2})
396-
interp1.exec_sync(dedent(f"""
396+
interp1.exec(dedent(f"""
397397
from test.support import interpreters
398398
interp2 = interpreters.Interpreter({interp2.id})
399399
interp2.close()
@@ -427,7 +427,7 @@ def test_subthreads_still_running(self):
427427
FINISHED = b'F'
428428

429429
interp = interpreters.create()
430-
interp.exec_sync(f"""if True:
430+
interp.exec(f"""if True:
431431
import os
432432
import threading
433433
import time
@@ -504,9 +504,9 @@ def test_not_shareable(self):
504504

505505
# Make sure neither was actually bound.
506506
with self.assertRaises(interpreters.ExecFailure):
507-
interp.exec_sync('print(foo)')
507+
interp.exec('print(foo)')
508508
with self.assertRaises(interpreters.ExecFailure):
509-
interp.exec_sync('print(spam)')
509+
interp.exec('print(spam)')
510510

511511

512512
class TestInterpreterExecSync(TestBase):
@@ -515,15 +515,15 @@ def test_success(self):
515515
interp = interpreters.create()
516516
script, file = _captured_script('print("it worked!", end="")')
517517
with file:
518-
interp.exec_sync(script)
518+
interp.exec(script)
519519
out = file.read()
520520

521521
self.assertEqual(out, 'it worked!')
522522

523523
def test_failure(self):
524524
interp = interpreters.create()
525525
with self.assertRaises(interpreters.ExecFailure):
526-
interp.exec_sync('raise Exception')
526+
interp.exec('raise Exception')
527527

528528
def test_display_preserved_exception(self):
529529
tempdir = self.temp_dir()
@@ -542,18 +542,18 @@ def script():
542542
spam.eggs()
543543
544544
interp = interpreters.create()
545-
interp.exec_sync(script)
545+
interp.exec(script)
546546
""")
547547

548548
stdout, stderr = self.assert_python_failure(scriptfile)
549549
self.maxDiff = None
550-
interpmod_line, = (l for l in stderr.splitlines() if ' exec_sync' in l)
551-
# File "{interpreters.__file__}", line 179, in exec_sync
550+
interpmod_line, = (l for l in stderr.splitlines() if ' exec' in l)
551+
# File "{interpreters.__file__}", line 179, in exec
552552
self.assertEqual(stderr, dedent(f"""\
553553
Traceback (most recent call last):
554554
File "{scriptfile}", line 9, in <module>
555-
interp.exec_sync(script)
556-
~~~~~~~~~~~~~~~~^^^^^^^^
555+
interp.exec(script)
556+
~~~~~~~~~~~^^^^^^^^
557557
{interpmod_line.strip()}
558558
raise ExecFailure(excinfo)
559559
test.support.interpreters.ExecFailure: RuntimeError: uh-oh!
@@ -578,7 +578,7 @@ def test_in_thread(self):
578578
script, file = _captured_script('print("it worked!", end="")')
579579
with file:
580580
def f():
581-
interp.exec_sync(script)
581+
interp.exec(script)
582582

583583
t = threading.Thread(target=f)
584584
t.start()
@@ -604,7 +604,7 @@ def test_fork(self):
604604
with open('{file.name}', 'w', encoding='utf-8') as out:
605605
out.write('{expected}')
606606
""")
607-
interp.exec_sync(script)
607+
interp.exec(script)
608608

609609
file.seek(0)
610610
content = file.read()
@@ -615,17 +615,17 @@ def test_already_running(self):
615615
interp = interpreters.create()
616616
with _running(interp):
617617
with self.assertRaises(RuntimeError):
618-
interp.exec_sync('print("spam")')
618+
interp.exec('print("spam")')
619619

620620
def test_bad_script(self):
621621
interp = interpreters.create()
622622
with self.assertRaises(TypeError):
623-
interp.exec_sync(10)
623+
interp.exec(10)
624624

625625
def test_bytes_for_script(self):
626626
interp = interpreters.create()
627627
with self.assertRaises(TypeError):
628-
interp.exec_sync(b'print("spam")')
628+
interp.exec(b'print("spam")')
629629

630630
def test_with_background_threads_still_running(self):
631631
r_interp, w_interp = self.pipe()
@@ -636,7 +636,7 @@ def test_with_background_threads_still_running(self):
636636
FINISHED = b'F'
637637

638638
interp = interpreters.create()
639-
interp.exec_sync(f"""if True:
639+
interp.exec(f"""if True:
640640
import os
641641
import threading
642642
@@ -648,18 +648,18 @@ def task():
648648
t.start()
649649
os.write({w_interp}, {RAN!r})
650650
""")
651-
interp.exec_sync(f"""if True:
651+
interp.exec(f"""if True:
652652
os.write({w_interp}, {RAN!r})
653653
""")
654654

655655
os.write(w_thread, DONE)
656-
interp.exec_sync('t.join()')
656+
interp.exec('t.join()')
657657
self.assertEqual(os.read(r_interp, 1), RAN)
658658
self.assertEqual(os.read(r_interp, 1), RAN)
659659
self.assertEqual(os.read(r_interp, 1), FINISHED)
660660

661661
# test_xxsubinterpreters covers the remaining
662-
# Interpreter.exec_sync() behavior.
662+
# Interpreter.exec() behavior.
663663

664664

665665
class TestInterpreterRun(TestBase):

‎Lib/test/test_interpreters/test_channels.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def test_send_recv_main(self):
120120

121121
def test_send_recv_same_interpreter(self):
122122
interp = interpreters.create()
123-
interp.exec_sync(dedent("""
123+
interp.exec(dedent("""
124124
from test.support.interpreters import channels
125125
r, s = channels.create()
126126
orig = b'spam'
@@ -193,7 +193,7 @@ def test_send_recv_nowait_main_with_default(self):
193193

194194
def test_send_recv_nowait_same_interpreter(self):
195195
interp = interpreters.create()
196-
interp.exec_sync(dedent("""
196+
interp.exec(dedent("""
197197
from test.support.interpreters import channels
198198
r, s = channels.create()
199199
orig = b'spam'

‎Lib/test/test_interpreters/test_lifecycle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_sys_path_0(self):
124124
orig = sys.path[0]
125125
126126
interp = interpreters.create()
127-
interp.exec_sync(f"""if True:
127+
interp.exec(f"""if True:
128128
import json
129129
import sys
130130
print(json.dumps({{

‎Lib/test/test_interpreters/test_queues.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_shareable(self):
5151
queue1 = queues.create()
5252

5353
interp = interpreters.create()
54-
interp.exec_sync(dedent(f"""
54+
interp.exec(dedent(f"""
5555
from test.support.interpreters import queues
5656
queue1 = queues.Queue({queue1.id})
5757
"""));
@@ -281,7 +281,7 @@ def test_put_get_default_not_sharedonly(self):
281281

282282
def test_put_get_same_interpreter(self):
283283
interp = interpreters.create()
284-
interp.exec_sync(dedent("""
284+
interp.exec(dedent("""
285285
from test.support.interpreters import queues
286286
queue = queues.create()
287287
orig = b'spam'

‎Lib/test/test_interpreters/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ def _run_output(interp, request, init=None):
4141
with rpipe:
4242
if init:
4343
interp.prepare_main(init)
44-
interp.exec_sync(script)
44+
interp.exec(script)
4545
return rpipe.read()
4646

4747

4848
@contextlib.contextmanager
4949
def _running(interp):
5050
r, w = os.pipe()
5151
def run():
52-
interp.exec_sync(dedent(f"""
52+
interp.exec(dedent(f"""
5353
# wait for "signal"
5454
with open({r}) as rpipe:
5555
rpipe.read()

0 commit comments

Comments
 (0)
0