Skip to content

Commit d0d96e3

Browse files
committed
Use python3 and replace one more call to sage
1 parent 8b410b4 commit d0d96e3

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/sage/doctest/test.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2626
Check that :issue:`2235` has been fixed::
2727
28-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
28+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
2929
....: "--random-seed=0", "--optional=sage", "longtime.rst"], **kwds)
3030
Running doctests...
3131
Doctesting 1 file.
@@ -36,7 +36,7 @@
3636
----------------------------------------------------------------------
3737
...
3838
0
39-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
39+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
4040
....: "--random-seed=0", "--optional=sage", "-l", "longtime.rst"], **kwds)
4141
Running doctests...
4242
Doctesting 1 file.
@@ -50,7 +50,7 @@
5050
5151
Check handling of tolerances::
5252
53-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
53+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
5454
....: "--random-seed=0", "--optional=sage", "tolerance.rst"], **kwds)
5555
Running doctests...
5656
Doctesting 1 file.
@@ -120,7 +120,7 @@
120120
121121
Test the ``--initial`` option::
122122
123-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
123+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
124124
....: "--random-seed=0", "--optional=sage", "-i", "initial.rst"], **kwds)
125125
Running doctests...
126126
Doctesting 1 file.
@@ -151,7 +151,7 @@
151151
152152
Test the ``--exitfirst`` option::
153153
154-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
154+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
155155
....: "--random-seed=0", "--optional=sage", "--exitfirst", "initial.rst"], **kwds)
156156
Running doctests...
157157
Doctesting 1 file.
@@ -179,7 +179,7 @@
179179
sage: from copy import deepcopy
180180
sage: kwds2 = deepcopy(kwds)
181181
sage: kwds2['env'].update({'SAGE_TIMEOUT': '1', 'CYSIGNALS_CRASH_NDEBUG': '1'})
182-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
182+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
183183
....: "--random-seed=0", "--optional=sage", "99seconds.rst"], **kwds2)
184184
Running doctests...
185185
Doctesting 1 file.
@@ -196,7 +196,7 @@
196196
197197
Test handling of ``KeyboardInterrupt`` in doctests::
198198
199-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
199+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
200200
....: "--random-seed=0", "--optional=sage", "keyboardinterrupt.rst"], **kwds)
201201
Running doctests...
202202
Doctesting 1 file.
@@ -219,7 +219,7 @@
219219
220220
Interrupt the doctester::
221221
222-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
222+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
223223
....: "--random-seed=0", "--optional=sage", "interrupt.rst"], **kwds)
224224
Running doctests...
225225
Doctesting 1 file.
@@ -238,7 +238,7 @@
238238
sage: from copy import deepcopy
239239
sage: kwds2 = deepcopy(kwds)
240240
sage: kwds2['env']['DOCTEST_TEST_PID_FILE'] = F # Doctester will write its PID in this file
241-
sage: subprocess.call(["sage", "-tp", "1000000", "--timeout=120", # long time
241+
sage: subprocess.call(["python3", "-m", "sage.doctest", "-p", "1000000", "--timeout=120", # long time
242242
....: "--die_timeout=10", "--optional=sage",
243243
....: "--warn-long", "0", "99seconds.rst", "interrupt_diehard.rst"], **kwds2)
244244
Running doctests...
@@ -274,7 +274,7 @@
274274
275275
Test a doctest failing with ``abort()``::
276276
277-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
277+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
278278
....: "--random-seed=0", "--optional=sage", "abort.rst"], **kwds)
279279
Running doctests...
280280
Doctesting 1 file.
@@ -300,7 +300,7 @@
300300
represented by ``<DOTSCOLON>`` below)::
301301
302302
sage: # long time
303-
sage: proc = subprocess.run(["python", "-m", "sage.doctest", "--warn-long", "0",
303+
sage: proc = subprocess.run(["python3", "-m", "sage.doctest", "--warn-long", "0",
304304
....: "--random-seed=0", "--optional=sage", "fail_and_die.rst"], **kwds,
305305
....: stdout=subprocess.PIPE, text=True)
306306
sage: # the replacements are needed to avoid the strings being interpreted
@@ -336,7 +336,7 @@
336336
337337
Test that ``sig_on_count`` is checked correctly::
338338
339-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
339+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
340340
....: "--random-seed=0", "--optional=sage", "sig_on.rst"], **kwds)
341341
Running doctests...
342342
Doctesting 1 file.
@@ -362,7 +362,7 @@
362362
Test logfiles in serial and parallel mode (see :issue:`19271`)::
363363
364364
sage: t = tmp_filename()
365-
sage: subprocess.call(["python", "-m", "sage.doctest", "--serial", "--warn-long", "0", # long time
365+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--serial", "--warn-long", "0", # long time
366366
....: "--random-seed=0", "--optional=sage", "--logfile", t, "simple_failure.rst"],
367367
....: stdout=open(os.devnull, "w"), **kwds)
368368
1
@@ -387,7 +387,7 @@
387387
----------------------------------------------------------------------
388388
...
389389
390-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
390+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
391391
....: "--random-seed=0", "--optional=sage", "--logfile", t, "simple_failure.rst"],
392392
....: stdout=open(os.devnull, "w"), **kwds)
393393
1
@@ -414,7 +414,7 @@
414414
415415
Test the ``--debug`` option::
416416
417-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
417+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
418418
....: "--random-seed=0", "--optional=sage", "--debug", "simple_failure.rst"],
419419
....: stdin=open(os.devnull), **kwds)
420420
Running doctests...
@@ -449,7 +449,7 @@
449449
450450
Test running under gdb, without and with a timeout::
451451
452-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time, optional: gdb
452+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time, optional: gdb
453453
....: "--random-seed=0", "--optional=sage", "--gdb", "1second.rst"],
454454
....: stdin=open(os.devnull), **kwds)
455455
exec gdb ...
@@ -465,7 +465,7 @@
465465
466466
gdb might need a long time to start up, so we allow 30 seconds::
467467
468-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time, optional: gdb
468+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time, optional: gdb
469469
....: "--random-seed=0", "--optional=sage", "--gdb", "-T30", "99seconds.rst"],
470470
....: stdin=open(os.devnull), **kwds)
471471
exec gdb ...
@@ -475,7 +475,7 @@
475475
476476
Test the ``--show-skipped`` option::
477477
478-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
478+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
479479
....: "--random-seed=0", "--optional=sage", "--show-skipped", "show_skipped.rst"], **kwds)
480480
Running doctests ...
481481
Doctesting 1 file.
@@ -494,7 +494,7 @@
494494
495495
Optional tests are run correctly::
496496
497-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", "--long", # long time
497+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", "--long", # long time
498498
....: "--random-seed=0", "--show-skipped", "--optional=sage,gap", "show_skipped.rst"], **kwds)
499499
Running doctests ...
500500
Doctesting 1 file.
@@ -509,7 +509,7 @@
509509
...
510510
0
511511
512-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", "--long", # long time
512+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", "--long", # long time
513513
....: "--random-seed=0", "--show-skipped", "--optional=gAp", "show_skipped.rst"], **kwds)
514514
Running doctests ...
515515
Doctesting 1 file.
@@ -527,7 +527,7 @@
527527
528528
Test an invalid value for ``--optional``::
529529
530-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0",
530+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0",
531531
....: "--random-seed=0", "--optional=bad-option", "show_skipped.rst"], **kwds)
532532
Traceback (most recent call last):
533533
...
@@ -542,7 +542,7 @@
542542
sage: from copy import deepcopy
543543
sage: kwds2 = deepcopy(kwds)
544544
sage: kwds2['env']['DOCTEST_DELETE_FILE'] = F
545-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
545+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
546546
....: "--random-seed=0", "--optional=sage", "atexit.rst"], **kwds2)
547547
Running doctests...
548548
Doctesting 1 file.
@@ -562,7 +562,7 @@
562562
563563
Test that random tests are reproducible::
564564
565-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
565+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
566566
....: "--random-seed=0", "--optional=sage", "random_seed.rst"], **kwds)
567567
Running doctests...
568568
Doctesting 1 file.
@@ -584,7 +584,7 @@
584584
----------------------------------------------------------------------
585585
...
586586
1
587-
sage: subprocess.call(["python", "-m", "sage.doctest", "--warn-long", "0", # long time
587+
sage: subprocess.call(["python3", "-m", "sage.doctest", "--warn-long", "0", # long time
588588
....: "--random-seed=1", "--optional=sage", "random_seed.rst"], **kwds)
589589
Running doctests...
590590
Doctesting 1 file.

0 commit comments

Comments
 (0)