Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2020-01-28 01:44:05 -05:00
4 changed files with 4 additions and 3 deletions

View File

@@ -8,7 +8,7 @@ See http://www.goebel-consult.de/decompyle/ for download and
for further information for further information
""" """
# This is a seperate test pattern, since 'continue' within 'try' # This is a separate test pattern, since 'continue' within 'try'
# was not allowed till Python 2.1 # was not allowed till Python 2.1
for term in args: for term in args:

View File

@@ -228,6 +228,6 @@ if __name__ == "__main__":
# Verification notes: # Verification notes:
# - xdrlib fails verification due the same lambda used twice # - xdrlib fails verification due the same lambda used twice
# (verification is successfull when using original .pyo as # (verification is successful when using original .pyo as
# input) # input)
# #

View File

@@ -18,7 +18,7 @@ Usage:
Disassemble FILE with the instruction mangling that is done to Disassemble FILE with the instruction mangling that is done to
assist uncompyle6 in parsing the instruction stream. For example assist uncompyle6 in parsing the instruction stream. For example
instructions with variable-length arguments like CALL_FUNCTION and instructions with variable-length arguments like CALL_FUNCTION and
BUILD_LIST have arguement counts appended to the instruction name, and BUILD_LIST have argument counts appended to the instruction name, and
COME_FROM instructions are inserted into the instruction stream. COME_FROM instructions are inserted into the instruction stream.
Examples: Examples:

View File

@@ -321,6 +321,7 @@ class Python37Parser(Python37BaseParser):
import ::= LOAD_CONST LOAD_CONST alias import ::= LOAD_CONST LOAD_CONST alias
import_from_star ::= LOAD_CONST LOAD_CONST IMPORT_NAME IMPORT_STAR import_from_star ::= LOAD_CONST LOAD_CONST IMPORT_NAME IMPORT_STAR
import_from_star ::= LOAD_CONST LOAD_CONST IMPORT_NAME_ATTR IMPORT_STAR
import_from ::= LOAD_CONST LOAD_CONST IMPORT_NAME importlist POP_TOP import_from ::= LOAD_CONST LOAD_CONST IMPORT_NAME importlist POP_TOP
importmultiple ::= LOAD_CONST LOAD_CONST alias imports_cont importmultiple ::= LOAD_CONST LOAD_CONST alias imports_cont