FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-40939: Remove the old parser (GH-20768) · python-emscripten/cpython@1ed83ad · GitHub

  1. python-emscripten
  2. cpython

Repository navigation

Commit 1ed83ad

Browse files
pablogsal
authored
bpo-40939: Remove the old parser (pythonGH-20768)
This commit removes the old parser, the deprecated parser module, the old parser compatibility flags and environment variables and all associated support code and documentation.
1 parent 311110a commit 1ed83ad

53 files changed

Lines changed: 24417 additions & 35948 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Doc/c-api/init_config.rst‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,16 +695,6 @@ PyConfig
695695
696696
:data:`sys._xoptions`.
697697
698-
.. c:member:: int _use_peg_parser
699-
700-
Enable PEG parser? Default: 1.
701-
702-
Set to 0 by :option:`-X oldparser <-X>` and :envvar:`PYTHONOLDPARSER`.
703-
704-
See also :pep:`617`.
705-
706-
.. deprecated-removed:: 3.9 3.10
707-
708698
If ``parse_argv`` is non-zero, ``argv`` arguments are parsed the same
709699
way the regular Python parses command line arguments, and Python
710700
arguments are stripped from ``argv``: see :ref:`Command Line Arguments

‎Doc/using/cmdline.rst‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,6 @@ Miscellaneous options
426426
defines the following possible values:
427427

428428
* ``-X faulthandler`` to enable :mod:`faulthandler`;
429-
* ``-X oldparser``: enable the traditional LL(1) parser. See also
430-
:envvar:`PYTHONOLDPARSER` and :pep:`617`.
431429
* ``-X showrefcount`` to output the total reference count and number of used
432430
memory blocks when the program finishes or after each statement in the
433431
interactive interpreter. This only works on debug builds.
@@ -587,15 +585,6 @@ conflict.
587585
:option:`-d` multiple times.
588586

589587

590-
.. envvar:: PYTHONOLDPARSER
591-
592-
If this is set to a non-empty string, enable the traditional LL(1) parser.
593-
594-
See also the :option:`-X` ``oldparser`` option and :pep:`617`.
595-
596-
.. deprecated-removed:: 3.9 3.10
597-
598-
599588
.. envvar:: PYTHONINSPECT
600589

601590
If this is set to a non-empty string it is equivalent to specifying the

‎Include/cpython/initconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ typedef struct {
144144
Set to 1 by -X faulthandler and PYTHONFAULTHANDLER. -1 means unset. */
145145
int faulthandler;
146146

147-
/* Enable PEG parser?
148-
1 by default, set to 0 by -X oldparser and PYTHONOLDPARSER */
149-
int _use_peg_parser;
150-
151147
/* Enable tracemalloc?
152148
Set by -X tracemalloc=N and PYTHONTRACEMALLOC. -1 means unset */
153149
int tracemalloc;

‎Lib/subprocess.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def _args_from_interpreter_flags():
326326
if dev_mode:
327327
args.extend(('-X', 'dev'))
328328
for opt in ('faulthandler', 'tracemalloc', 'importtime',
329-
'showrefcount', 'utf8', 'oldparser'):
329+
'showrefcount', 'utf8'):
330330
if opt in xoptions:
331331
value = xoptions[opt]
332332
if value is True:

‎Lib/test/support/__init__.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,13 +1958,3 @@ def wait_process(pid, *, exitcode, timeout=None):
19581958
# sanity check: it should not fail in practice
19591959
if pid2 != pid:
19601960
raise AssertionError(f"pid {pid2} != pid {pid}")
1961-
1962-
1963-
def use_old_parser():
1964-
import _testinternalcapi
1965-
config = _testinternalcapi.get_configs()
1966-
return (config['config']['_use_peg_parser'] == 0)
1967-
1968-
1969-
def skip_if_new_parser(msg):
1970-
return unittest.skipIf(not use_old_parser(), msg)

‎Lib/test/test_embed.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
347347
'isolated': 0,
348348
'use_environment': 1,
349349
'dev_mode': 0,
350-
'_use_peg_parser': 1,
351350

352351
'install_signal_handlers': 1,
353352
'use_hash_seed': 0,
@@ -733,7 +732,6 @@ def test_init_from_config(self):
733732
'import_time': 1,
734733
'show_ref_count': 1,
735734
'malloc_stats': 1,
736-
'_use_peg_parser': 0,
737735

738736
'stdio_encoding': 'iso8859-1',
739737
'stdio_errors': 'replace',
@@ -807,7 +805,6 @@ def test_init_compat_env(self):
807805
'warnoptions': ['EnvVar'],
808806
'platlibdir': 'env_platlibdir',
809807
'module_search_paths': self.IGNORE_CONFIG,
810-
'_use_peg_parser': 0,
811808
}
812809
self.check_all_configs("test_init_compat_env", config, preconfig,
813810
api=API_COMPAT)
@@ -837,7 +834,6 @@ def test_init_python_env(self):
837834
'warnoptions': ['EnvVar'],
838835
'platlibdir': 'env_platlibdir',
839836
'module_search_paths': self.IGNORE_CONFIG,
840-
'_use_peg_parser': 0,
841837
}
842838
self.check_all_configs("test_init_python_env", config, preconfig,
843839
api=API_PYTHON)

‎Lib/test/test_exceptions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ def baz():
251251
check('def f():\n x, y: int', 2, 3)
252252
check('[*x for x in xs]', 1, 2)
253253
check('foo(x for x in range(10), 100)', 1, 5)
254-
check('(yield i) = 2', 1, 1 if support.use_old_parser() else 2)
255-
check('def f(*):\n pass', 1, 7 if support.use_old_parser() else 8)
256-
check('for 1 in []: pass', 1, 5 if support.use_old_parser() else 7)
254+
check('(yield i) = 2', 1, 2)
255+
check('def f(*):\n pass', 1, 8)
256+
check('for 1 in []: pass', 1, 7)
257257

258258
@cpython_only
259259
def testSettingException(self):

‎Lib/test/test_flufl.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_barry_as_bdfl(self):
2020
self.assertTrue(cm.exception.lineno, 2)
2121
# The old parser reports the end of the token and the new
2222
# parser reports the start of the token
23-
self.assertEqual(cm.exception.offset, 4 if support.use_old_parser() else 3)
23+
self.assertEqual(cm.exception.offset, 3)
2424

2525
def test_guido_as_bdfl(self):
2626
code = '2 {0} 3'
@@ -33,7 +33,7 @@ def test_guido_as_bdfl(self):
3333
self.assertEqual(cm.exception.lineno, 1)
3434
# The old parser reports the end of the token and the new
3535
# parser reports the start of the token
36-
self.assertEqual(cm.exception.offset, 4 if support.use_old_parser() else 3)
36+
self.assertEqual(cm.exception.offset, 3)
3737

3838

3939
if __name__ == '__main__':

‎Lib/test/test_fstring.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import types
1313
import decimal
1414
import unittest
15-
from test.support import temp_cwd, use_old_parser
15+
from test.support import temp_cwd
1616
from test.support.script_helper import assert_python_failure
1717

1818
a_global = 'global variable'
@@ -1049,7 +1049,6 @@ def test_errors(self):
10491049
r"f'{1000:j}'",
10501050
])
10511051

1052-
@unittest.skipIf(use_old_parser(), "The old parser only supports <fstring> as the filename")
10531052
def test_filename_in_syntaxerror(self):
10541053
# see issue 38964
10551054
with temp_cwd() as cwd:

‎Lib/test/test_grammar.py‎

Lines changed: 47 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Python test set -- part 1, grammar.
22
# This just tests whether the parser accepts them all.
33

4-
from test.support import check_syntax_error, check_syntax_warning, use_old_parser
4+
from test.support import check_syntax_error, check_syntax_warning
55
import inspect
66
import unittest
77
import sys
@@ -1714,69 +1714,53 @@ def __exit__(self, *args):
17141714
with manager() as x, manager():
17151715
pass
17161716

1717-
if not use_old_parser():
1718-
test_cases = [
1719-
"""if 1:
1720-
with (
1721-
manager()
1722-
):
1723-
pass
1724-
""",
1725-
"""if 1:
1726-
with (
1727-
manager() as x
1728-
):
1729-
pass
1730-
""",
1731-
"""if 1:
1732-
with (
1733-
manager() as (x, y),
1734-
manager() as z,
1735-
):
1736-
pass
1737-
""",
1738-
"""if 1:
1739-
with (
1740-
manager(),
1741-
manager()
1742-
):
1743-
pass
1744-
""",
1745-
"""if 1:
1746-
with (
1747-
manager() as x,
1748-
manager() as y
1749-
):
1750-
pass
1751-
""",
1752-
"""if 1:
1753-
with (
1754-
manager() as x,
1755-
manager()
1756-
):
1757-
pass
1758-
""",
1759-
"""if 1:
1760-
with (
1761-
manager() as x,
1762-
manager() as y,
1763-
manager() as z,
1764-
):
1765-
pass
1766-
""",
1767-
"""if 1:
1768-
with (
1769-
manager() as x,
1770-
manager() as y,
1771-
manager(),
1772-
):
1773-
pass
1774-
""",
1775-
]
1776-
for case in test_cases:
1777-
with self.subTest(case=case):
1778-
compile(case, "<string>", "exec")
1717+
with (
1718+
manager()
1719+
):
1720+
pass
1721+
1722+
with (
1723+
manager() as x
1724+
):
1725+
pass
1726+
1727+
with (
1728+
manager() as (x, y),
1729+
manager() as z,
1730+
):
1731+
pass
1732+
1733+
with (
1734+
manager(),
1735+
manager()
1736+
):
1737+
pass
17791738

1739+
with (
1740+
manager() as x,
1741+
manager() as y
1742+
):
1743+
pass
1744+
1745+
with (
1746+
manager() as x,
1747+
manager()
1748+
):
1749+
pass
1750+
1751+
with (
1752+
manager() as x,
1753+
manager() as y,
1754+
manager() as z,
1755+
):
1756+
pass
1757+
1758+
with (
1759+
manager() as x,
1760+
manager() as y,
1761+
manager(),
1762+
):
1763+
pass
17801764

17811765
def test_if_else_expr(self):
17821766
# Test ifelse expressions in various cases

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL