From 29a91fc015b3a3fe42dcbc5a855c42f3546c82ad Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 21 Oct 2021 16:33:09 -0400
Subject: [PATCH] Version twiddling

---
 admin-tools/setup-master.sh            |  2 +-
 admin-tools/setup-python-3.3.sh        | 15 +++++++++++++++
 uncompyle6/semantics/make_function3.py | 14 ++------------
 3 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 admin-tools/setup-python-3.3.sh

diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index d5fa6451..0bf2a0e2 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -20,4 +20,4 @@ cd $fulldir/..
     (cd ../python-xdis && git checkout master && pyenv local $PYTHON_VERSION) && git pull && \
     git checkout master && pyenv local $PYTHON_VERSION && git pull
 cd $owd
-rm -v */.python-version || true
+rm -v */.python-version >/dev/null 2>&1 || true
diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh
new file mode 100644
index 00000000..5af28261
--- /dev/null
+++ b/admin-tools/setup-python-3.3.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+PYTHON_VERSION=3.3.7
+pyenv local $PYTHON_VERSION
+
+owd=$(pwd)
+bs=${BASH_SOURCE[0]}
+
+mydir=$(dirname $bs)
+fulldir=$(readlink -f $mydir)
+cd $fulldir/..
+(cd ../python-xdis && ./admin-tools/setup-python-3.3.sh)
+cd $owd
+rm -v */.python-version || true
+
+git checkout python-3.3-to-3.5  && git pull && pyenv local $PYTHON_VERSION
diff --git a/uncompyle6/semantics/make_function3.py b/uncompyle6/semantics/make_function3.py
index 39603b5f..d749cf0b 100644
--- a/uncompyle6/semantics/make_function3.py
+++ b/uncompyle6/semantics/make_function3.py
@@ -19,7 +19,6 @@ The saga of changes before and after is in other files.
 from xdis import iscode, code_has_star_arg, code_has_star_star_arg, CO_GENERATOR
 from uncompyle6.scanner import Code
 from uncompyle6.parsers.treenode import SyntaxTree
-from uncompyle6 import PYTHON3
 from uncompyle6.semantics.parser_error import ParserError
 from uncompyle6.parser import ParserError as ParserError2
 from uncompyle6.semantics.helper import (
@@ -29,11 +28,6 @@ from uncompyle6.semantics.helper import (
     find_none,
 )
 
-if PYTHON3:
-    from itertools import zip_longest
-else:
-    from itertools import izip_longest as zip_longest
-
 from uncompyle6.show import maybe_show_tree_param_default
 
 # FIXME: DRY the below code...
@@ -90,12 +84,9 @@ def make_function3_annotate(
         # positional args are before kwargs
         defparams = node[: args_node.attr[0]]
         pos_args, kw_args, annotate_argc = args_node.attr
-        if "return" in annotate_args.keys():
-            annotate_argc = len(annotate_args) - 1
     else:
         defparams = node[: args_node.attr]
         kw_args = 0
-        annotate_argc = 0
         pass
 
     annotate_dict = {}
@@ -104,9 +95,9 @@ def make_function3_annotate(
         n = self.traverse(annotate_args[name], indent="")
         annotate_dict[name] = n
 
-    if 3.0 <= self.version <= 3.2:
+    if (3, 0) <= self.version < (3, 3):
         lambda_index = -2
-    elif 3.03 <= self.version:
+    elif self.version < (3, 4):
         lambda_index = -3
     else:
         lambda_index = None
@@ -142,7 +133,6 @@ def make_function3_annotate(
             self.ERROR = p
         return
 
-    kw_pairs = args_node.attr[1]
     indent = self.indent
 
     if is_lambda: