httpservlet
diff --git a/‎test/bytecode_3.1/04_def_annotate.pyc‎
699 Bytes b/‎test/bytecode_3.1/04_def_annotate.pyc‎
699 Bytes
diff --git a/‎test/bytecode_3.4/04_def_annotate.pyc‎
511 Bytes b/‎test/bytecode_3.4/04_def_annotate.pyc‎
511 Bytes
diff --git a/‎test/simple_source/bug31/04_def_annotate.py‎
Lines changed: 5 additions & 1 deletion b/‎test/simple_source/bug31/04_def_annotate.py‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎uncompyle6/semantics/make_function.py‎
Lines changed: 36 additions & 12 deletions b/‎uncompyle6/semantics/make_function.py‎
Lines changed: 36 additions & 12 deletions
@@ -1,5 +1,9 @@
-# Bug in 3.1 _pyio.py. The -> "IOBase" is problematic
+# Python 3 annotations
 
+def foo(a, b: 'annotating b', c: int) -> float:
+    print(a + b + c)
+
+# Python 3.1 _pyio.py uses the  -> "IOBase" annotation
 def open(file, mode = "r", buffering = None,
          encoding = None, errors = None,
          newline = None, closefd = True) -> "IOBase":
 
@@ -70,22 +70,27 @@ def build_param(ast, name, default):
     # MAKE_FUNCTION_... or MAKE_CLOSURE_...
     assert node[-1].type.startswith('MAKE_')
 
-    annotate_return = None
     annotate_arg = node[annotate_last]
+    annotate_args = {}
 
     if (annotate_arg == 'annotate_arg'
-        and annotate_arg[0] == 'LOAD_CONST'
+        and annotate_arg[0] in ('LOAD_CONST', 'LOAD_NAME')
         and isinstance(annotate_arg[0].attr, tuple)):
         annotate_tup = annotate_arg[0].attr
-        if annotate_tup[-1] == 'return':
-            annotate_return = node[annotate_last-1][0].attr
-            pass
+        i = -1
+        j = annotate_last-1
+        l = -len(node)
+        while j >= l and node[j] == 'annotate_arg':
+            annotate_args[annotate_tup[i]] = (node[j][0].attr,
+                                              node[j][0] == 'LOAD_CONST')
+            i -= 1
+            j -= 1
 
     args_node = node[-1]
     if isinstance(args_node.attr, tuple):
         # positional args are before kwargs
         defparams = node[:args_node.attr[0]]
-        pos_args, kw_args, annotate_args  = args_node.attr
+        pos_args, kw_args, annotate_argc  = args_node.attr
     else:
         defparams = node[:args_node.attr]
         kw_args  = 0
@@ -139,12 +144,26 @@ def build_param(ast, name, default):
         argc += 1
 
     i = len(paramnames) - len(defparams)
-    self.write(", ".join(paramnames[:i]))
+    suffix = ''
+    for param in paramnames[:i]:
+        self.write(suffix, param)
+        if param in annotate_args:
+            value, string = annotate_args[param]
+            if string:
+                self.write(': "%s"' % value)
+            else:
+                self.write(': %s' % value)
+        suffix = ', '
+
     suffix = ', ' if i > 0 else ''
     for n in node:
         if n == 'pos_arg':
             self.write(suffix)
-            self.write(paramnames[i] + '=')
+            param = paramnames[i]
+            self.write(param)
+            if param in annotate_args:
+                self.write(':"%s' % annotate_args[param])
+            self.write('=')
             i += 1
             self.preorder(n)
             if (line_number != self.line_number):
@@ -187,8 +206,13 @@ def build_param(ast, name, default):
         self.write(": ")
     else:
         self.write(')')
-        if annotate_return:
-            self.write(' -> "%s"' % annotate_return)
+        if 'return' in annotate_args:
+            value, string = annotate_args['return']
+            if string:
+                self.write(' -> "%s"' % value)
+            else:
+                self.write(' -> %s' % value)
+
         self.println(":")
 
     if (len(code.co_consts) > 0 and
@@ -247,7 +271,7 @@ def build_param(ast, name, default):
     if isinstance(args_node.attr, tuple):
         # positional args are after kwargs
         defparams = node[1:args_node.attr[0]+1]
-        pos_args, kw_args, annotate_args  = args_node.attr
+        pos_args, kw_args, annotate_argc  = args_node.attr
     else:
         defparams = node[:args_node.attr]
         kw_args  = 0
@@ -377,7 +401,7 @@ def build_param(ast, name, default):
         else:
             # positional args are before kwargs
             defparams = node[:args_node.attr[0]]
-        pos_args, kw_args, annotate_args  = args_node.attr
+        pos_args, kw_args, annotate_argc  = args_node.attr
     else:
         defparams = node[:args_node.attr]
         kw_args  = 0