diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b51fd593..4cbf372a 100644 --- a/.pre-commit-config.yaml +++ b/.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] diff --git a/admin-tools/setup-python-2.4.sh b/admin-tools/setup-python-2.4.sh index 843cf285..71e4ee04 100755 --- a/admin-tools/setup-python-2.4.sh +++ b/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 diff --git a/test/bytecode_2.7/06_nop.pyc b/test/bytecode_2.7/06_nop.pyc new file mode 100644 index 00000000..0f6f966d Binary files /dev/null and b/test/bytecode_2.7/06_nop.pyc differ diff --git a/test/bytecode_3.6/06_nop.pyc b/test/bytecode_3.6/06_nop.pyc new file mode 100644 index 00000000..f0420f2b Binary files /dev/null and b/test/bytecode_3.6/06_nop.pyc differ diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py index 2409f9f1..35d9bb55 100644 --- a/uncompyle6/parser.py +++ b/uncompyle6/parser.py @@ -391,6 +391,10 @@ class PythonParser(GenericASTBuilder): returns ::= return returns ::= _stmts return + + # NOP + stmt ::= nop_stmt + nop_stmt ::= NOP """ pass diff --git a/uncompyle6/semantics/customize37.py b/uncompyle6/semantics/customize37.py index 41e375ab..60210800 100644 --- a/uncompyle6/semantics/customize37.py +++ b/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