Remove tox pin (#3844)

[etc/vim.git] / src / blib2to3 / pygram.py

diff --git a/src/blib2to3/pygram.py b/src/blib2to3/pygram.py
index aa20b8104aea914d4751c6ed40a93a18cb57f76b..c30c630e81685f905e104c3f56460dc00eae6f21 100644 (file)
--- a/src/blib2to3/pygram.py
+++ b/src/blib2to3/pygram.py
@@ -5,13 +5,10 @@
 
 # Python imports
 import os
 
 # Python imports
 import os

-

 from typing import Union
 
 # Local imports
 from typing import Union
 
 # Local imports

-from .pgen2 import token

 from .pgen2 import driver
 from .pgen2 import driver

-

 from .pgen2.grammar import Grammar
 
 # Moved into initialize because mypyc can't handle __file__ (XXX bug)
 from .pgen2.grammar import Grammar
 
 # Moved into initialize because mypyc can't handle __file__ (XXX bug)


@@ -21,7 +18,7 @@ from .pgen2.grammar import Grammar
 #                                      "PatternGrammar.txt")
 
 
 #                                      "PatternGrammar.txt")
 
 

-class Symbols(object):
+class Symbols:

     def __init__(self, grammar: Grammar) -> None:
         """Initializer.
 
     def __init__(self, grammar: Grammar) -> None:
         """Initializer.
 


@@ -95,6 +92,7 @@ class _python_symbols(Symbols):
     old_test: int
     or_test: int
     parameters: int
     old_test: int
     or_test: int
     parameters: int

+    paramspec: int

     pass_stmt: int
     pattern: int
     patterns: int
     pass_stmt: int
     pattern: int
     patterns: int


@@ -123,9 +121,15 @@ class _python_symbols(Symbols):
     tfpdef: int
     tfplist: int
     tname: int
     tfpdef: int
     tfplist: int
     tname: int

+    tname_star: int

     trailer: int
     try_stmt: int
     trailer: int
     try_stmt: int

+    type_stmt: int

     typedargslist: int
     typedargslist: int

+    typeparam: int
+    typeparams: int
+    typevar: int
+    typevartuple: int

     varargslist: int
     vfpdef: int
     vfplist: int
     varargslist: int
     vfpdef: int
     vfplist: int


@@ -178,6 +182,8 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
 
     # Python 2
     python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE, cache_dir)
 
     # Python 2
     python_grammar = driver.load_packaged_grammar("blib2to3", _GRAMMAR_FILE, cache_dir)

+    python_grammar.version = (2, 0)
+

     soft_keywords = python_grammar.soft_keywords.copy()
     python_grammar.soft_keywords.clear()
 
     soft_keywords = python_grammar.soft_keywords.copy()
     python_grammar.soft_keywords.clear()
 


@@ -191,6 +197,7 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
     python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
     del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
     del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]
     python_grammar_no_print_statement_no_exec_statement = python_grammar.copy()
     del python_grammar_no_print_statement_no_exec_statement.keywords["print"]
     del python_grammar_no_print_statement_no_exec_statement.keywords["exec"]

+    python_grammar_no_print_statement_no_exec_statement.version = (3, 0)

 
     # Python 3.7+
     python_grammar_no_print_statement_no_exec_statement_async_keywords = (
 
     # Python 3.7+
     python_grammar_no_print_statement_no_exec_statement_async_keywords = (


@@ -199,12 +206,14 @@ def initialize(cache_dir: Union[str, "os.PathLike[str]", None] = None) -> None:
     python_grammar_no_print_statement_no_exec_statement_async_keywords.async_keywords = (
         True
     )
     python_grammar_no_print_statement_no_exec_statement_async_keywords.async_keywords = (
         True
     )

+    python_grammar_no_print_statement_no_exec_statement_async_keywords.version = (3, 7)

 
     # Python 3.10+
     python_grammar_soft_keywords = (
         python_grammar_no_print_statement_no_exec_statement_async_keywords.copy()
     )
     python_grammar_soft_keywords.soft_keywords = soft_keywords
 
     # Python 3.10+
     python_grammar_soft_keywords = (
         python_grammar_no_print_statement_no_exec_statement_async_keywords.copy()
     )
     python_grammar_soft_keywords.soft_keywords = soft_keywords

+    python_grammar_soft_keywords.version = (3, 10)

 
     pattern_grammar = driver.load_packaged_grammar(
         "blib2to3", _PATTERN_GRAMMAR_FILE, cache_dir
 
     pattern_grammar = driver.load_packaged_grammar(
         "blib2to3", _PATTERN_GRAMMAR_FILE, cache_dir