py-uncompyle6: updated to 3.6.2

3.6.2:

Yet again the focus has been on just fixing bugs, mostly geared in the
later 3.x range. To get some sense what sill needs fixing, consult
test/stdlib/runtests.sh. And that only has a portion of what's known.

make_function.py has gotten so complex that it was split out into 3 parts
to handle different version ranges: Python <3, Python 3.0..3.6 and Python 3.7+.

An important fix is that we had been dropping docstrings in Python 3 code as a result
of a incomplete merge from the decompile3 base with respect to the transform phase.

Also important (at least to me) is that we can now handle 3.6+
variable type annotations. Some of the decompile3 code uses that in
its source code, and I now use variable annotations in conjunction
with mypy in some of my other Python projects

Code generation for imports, especially where the import is dotted
changed a bit in 3.7; with this release are just now tracking that
change better. For this I've added pseudo instruction
IMPORT_NAME_ATTR, derived from the IMPORT_NAME instruction, to
indicate when an import contains a dotted import. Similarly, code for
3.7 import .. as is basically the same as from .. import, the
only difference is the target of the name changes to an "alias" in the
former. As a result, the disambiguation is now done on the semantic
action side, rathero than in parsing grammar rules.

Some small specific fixes:

3.7+ some chained compare parsing has been fixed. Other remain.
better if/else rule checking in the 3.4 and below range.
3.4+ keyword-only parameter handling was fixed more generally
3.3 .. 3.5 keyword-only parameter args in lambda was fixed

3 files changed, 19 insertions, 11 deletions

diff --git a/lang/py-uncompyle6/Makefile b/lang/py-uncompyle6/Makefile
index 4fd6221a6e4..33bb9abf9d4 100644
--- a/lang/py-uncompyle6/Makefile
+++ b/lang/py-uncompyle6/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2019/12/31 10:22:46 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/01/08 15:19:14 adam Exp $
 
-DISTNAME=	uncompyle6-3.6.1
+DISTNAME=	uncompyle6-3.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=u/uncompyle6/}
diff --git a/lang/py-uncompyle6/PLIST b/lang/py-uncompyle6/PLIST
index 0d03a33fa04..17eaf33677b 100644
--- a/lang/py-uncompyle6/PLIST
+++ b/lang/py-uncompyle6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/12/31 10:22:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/01/08 15:19:14 adam Exp $
 bin/pydisassemble-${PYVERSSUFFIX}
 bin/uncompyle6-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -111,6 +111,8 @@ ${PYSITELIB}/uncompyle6/parsers/parse37base.py
 ${PYSITELIB}/uncompyle6/parsers/parse37base.pyc
 ${PYSITELIB}/uncompyle6/parsers/parse37base.pyo
 ${PYSITELIB}/uncompyle6/parsers/parse38.py
+${PYSITELIB}/uncompyle6/parsers/parse38.pyc
+${PYSITELIB}/uncompyle6/parsers/parse38.pyo
 ${PYSITELIB}/uncompyle6/parsers/treenode.py
 ${PYSITELIB}/uncompyle6/parsers/treenode.pyc
 ${PYSITELIB}/uncompyle6/parsers/treenode.pyo
@@ -264,9 +266,15 @@ ${PYSITELIB}/uncompyle6/semantics/helper.pyo
 ${PYSITELIB}/uncompyle6/semantics/linemap.py
 ${PYSITELIB}/uncompyle6/semantics/linemap.pyc
 ${PYSITELIB}/uncompyle6/semantics/linemap.pyo
-${PYSITELIB}/uncompyle6/semantics/make_function.py
-${PYSITELIB}/uncompyle6/semantics/make_function.pyc
-${PYSITELIB}/uncompyle6/semantics/make_function.pyo
+${PYSITELIB}/uncompyle6/semantics/make_function2.py
+${PYSITELIB}/uncompyle6/semantics/make_function2.pyc
+${PYSITELIB}/uncompyle6/semantics/make_function2.pyo
+${PYSITELIB}/uncompyle6/semantics/make_function3.py
+${PYSITELIB}/uncompyle6/semantics/make_function3.pyc
+${PYSITELIB}/uncompyle6/semantics/make_function3.pyo
+${PYSITELIB}/uncompyle6/semantics/make_function36.py
+${PYSITELIB}/uncompyle6/semantics/make_function36.pyc
+${PYSITELIB}/uncompyle6/semantics/make_function36.pyo
 ${PYSITELIB}/uncompyle6/semantics/parser_error.py
 ${PYSITELIB}/uncompyle6/semantics/parser_error.pyc
 ${PYSITELIB}/uncompyle6/semantics/parser_error.pyo
diff --git a/lang/py-uncompyle6/distinfo b/lang/py-uncompyle6/distinfo
index b8ddc85c161..d883b677ca7 100644
--- a/lang/py-uncompyle6/distinfo
+++ b/lang/py-uncompyle6/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2019/12/31 10:22:46 adam Exp $
+$NetBSD: distinfo,v 1.17 2020/01/08 15:19:14 adam Exp $
 
-SHA1 (uncompyle6-3.6.1.tar.gz) = 4521ec3b2f651de8af43ac061f711d5a8119801f
-RMD160 (uncompyle6-3.6.1.tar.gz) = d5d5fd7d7fde0369de568fddd208e0db4f098243
-SHA512 (uncompyle6-3.6.1.tar.gz) = c67eacb8b9bc69c63c711dc4dfdec7458d27c77050abc6793c078bf596bccf389ebb30c9ffe1a9c793b4eb3b10b0e3faba39458d9203f240df0c5001547b275a
-Size (uncompyle6-3.6.1.tar.gz) = 2296369 bytes
+SHA1 (uncompyle6-3.6.2.tar.gz) = 5f5156784593d127bd8d14327693ef1786fcf39b
+RMD160 (uncompyle6-3.6.2.tar.gz) = e00ad186baa9f58477c52733e2123f175ae79b82
+SHA512 (uncompyle6-3.6.2.tar.gz) = 70fae57ed0edc2cc2f8f3701d190a72c9a5ce0ee4ca60f04f6f56a300edb7bacb5ab81b3184461eef27258d556b56379ef0a2ad670259935dd381e03c8907b26
+Size (uncompyle6-3.6.2.tar.gz) = 2307106 bytes