Merge branch 'master' into python-3.6-to-3.10

.pre-commit-config.yaml

@@ -6,17 +6,17 @@ repos:
     hooks:
     - id: check-merge-conflict
     - id: debug-statements
-      stages: [commit]
+      stages: [pre-commit]
     - id: end-of-file-fixer
-      stages: [commit]
+      stages: [pre-commit]
 -   repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
       - id: isort
-        stages: [commit]
+        stages: [pre-commit]
 -   repo: https://github.com/psf/black
     rev: 23.12.1
     hooks:
     - id: black
       language_version: python3
-      stages: [commit]
+      stages: [pre-commit]

admin-tools/setup-python-2.4.sh

@@ -17,7 +17,7 @@ cd $mydir
 
 (cd $fulldir/.. && \
      setup_version python-spark python-2.4 && \
-     setup_verseion python-xdis python-2.4-to-2.7)
+     setup_version python-xdis python-2.4-to-2.7)
 
 
 checkout_finish python-2.4-to-2.7

uncompyle6/parser.py

@@ -391,6 +391,10 @@ class PythonParser(GenericASTBuilder):
 
         returns ::= return
         returns ::= _stmts return
+        
+        # NOP
+        stmt     ::= nop_stmt
+        nop_stmt ::= NOP
 
         """
         pass

uncompyle6/semantics/customize37.py

@@ -17,7 +17,7 @@
 
 import re
 
-from uncompyle6.semantics.consts import INDENT_PER_LEVEL, PRECEDENCE, TABLE_DIRECT
+from uncompyle6.semantics.consts import INDENT_PER_LEVEL, PRECEDENCE
 from uncompyle6.semantics.helper import flatten_list
 
 # FIXME get from a newer xdis