py-uncompyle6: updated to 3.6.1

3.6.1:
Overall, as in the past, the focus has been on just fixing bugs, more geared
in the later 3.x range. Handling "async for/with" in 3.8+ works better.

Numerous bugs around handling lambda with keyword-only and * args in the
3.0-3.8 have been fixed. However many still remain.

binary_expr and unary_expr have been renamed to bin_op and
unary_op to better correspond the Python AST names.

Some work was done Python 3.7+ to handle and better; less was done
along the lines of handling or. Much more is needed to improve
parsing stability of 3.7+. More of what was done with and needs to
be done with or and this will happen first in the "decompyle3"
project.

Later this will probably be extended backwards to handle the 3.6-
versions better. This however comes with a big decompilation speed
penalty. When we redo control flow this should go back to normal, but
for now, accuracy is more important than speed.

Another assert transform rule was added. Parser rules to distingish
try/finally in 3.8 were added and we are more stringent about what
can be turned into an assert. There was some grammar cleanup here
too.

A number of small bugs were fixed, and some administrative changes to
make make check-short really be short, but check more throughly what
it checks. minimum xdis version needed was bumped to include in the
newer 3.6-3.9 releases. See the ChangeLog for details.

3 files changed, 12 insertions, 11 deletions

diff --git a/lang/py-uncompyle6/Makefile b/lang/py-uncompyle6/Makefile
index 85e02a17a5b..4fd6221a6e4 100644
--- a/lang/py-uncompyle6/Makefile
+++ b/lang/py-uncompyle6/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2019/12/11 13:19:20 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/12/31 10:22:46 adam Exp $
 
-DISTNAME=	uncompyle6-3.6.0
+DISTNAME=	uncompyle6-3.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	lang python
 MASTER_SITES=	${MASTER_SITE_PYPI:=u/uncompyle6/}
@@ -11,7 +11,7 @@ COMMENT=	Python cross-version byte-code decompiler
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-spark-parser>=1.8.9:../../lang/py-spark-parser
-DEPENDS+=	${PYPKGPREFIX}-xdis>=4.2.0:../../devel/py-xdis
+DEPENDS+=	${PYPKGPREFIX}-xdis>=4.2.2:../../devel/py-xdis
 
 USE_LANGUAGES=	# none
 
diff --git a/lang/py-uncompyle6/PLIST b/lang/py-uncompyle6/PLIST
index 237f7f857c0..0d03a33fa04 100644
--- a/lang/py-uncompyle6/PLIST
+++ b/lang/py-uncompyle6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/12/11 13:19:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/12/31 10:22:46 adam Exp $
 bin/pydisassemble-${PYVERSSUFFIX}
 bin/uncompyle6-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -111,8 +111,6 @@ ${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
@@ -281,6 +279,9 @@ ${PYSITELIB}/uncompyle6/semantics/transform.pyo
 ${PYSITELIB}/uncompyle6/show.py
 ${PYSITELIB}/uncompyle6/show.pyc
 ${PYSITELIB}/uncompyle6/show.pyo
+${PYSITELIB}/uncompyle6/util.py
+${PYSITELIB}/uncompyle6/util.pyc
+${PYSITELIB}/uncompyle6/util.pyo
 ${PYSITELIB}/uncompyle6/verify.py
 ${PYSITELIB}/uncompyle6/verify.pyc
 ${PYSITELIB}/uncompyle6/verify.pyo
diff --git a/lang/py-uncompyle6/distinfo b/lang/py-uncompyle6/distinfo
index ffc4e051bbf..b8ddc85c161 100644
--- a/lang/py-uncompyle6/distinfo
+++ b/lang/py-uncompyle6/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2019/12/11 13:19:20 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/12/31 10:22:46 adam Exp $
 
-SHA1 (uncompyle6-3.6.0.tar.gz) = aeb942efce43946bf03f414676b3911f95ee20ac
-RMD160 (uncompyle6-3.6.0.tar.gz) = 02bfd528a1d7a5266b0016d174e8968e3b327c37
-SHA512 (uncompyle6-3.6.0.tar.gz) = 365bed4e99ff65636f04f6013af9b1642d9484ba49c2a71e9177b62352d985b827d6bc207256013eee94e80b17fc4349de46cf8472a8c7b1772ac260c0919313
-Size (uncompyle6-3.6.0.tar.gz) = 2245853 bytes
+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