Merge branch 'master' into python-2.4

test/decompyle/test_loops2.py

@@ -8,7 +8,7 @@ See http://www.goebel-consult.de/decompyle/ for download and
 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
 
 for term in args:

test/test_pyenvlib.py

@@ -228,6 +228,6 @@ if __name__ == "__main__":
 
 # Verification notes:
 # - 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)
 #

uncompyle6/bin/pydisassemble.py

@@ -18,7 +18,7 @@ Usage:
 Disassemble FILE with the instruction mangling that is done to
 assist uncompyle6 in parsing the instruction stream. For example
 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.
 
 Examples:

uncompyle6/parsers/parse37.py

@@ -321,6 +321,7 @@ class Python37Parser(Python37BaseParser):
 
         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_ATTR IMPORT_STAR
         import_from      ::= LOAD_CONST LOAD_CONST IMPORT_NAME importlist POP_TOP
         importmultiple   ::= LOAD_CONST LOAD_CONST alias imports_cont