Realign make_function3 with master

uncompyle6/semantics/make_function.py

@@ -637,13 +637,6 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
     # dump parameter list (with default values)
     if is_lambda:
         self.write("lambda ", ", ".join(params))
-        else:
-            self.write("(", ", ".join(params))
-        # self.println(indent, '#flags:\t', int(code.co_flags))
-
-    else:
-        if is_lambda:
-            self.write("lambda ")
         # If the last statement is None (which is the
         # same thing as "return None" in a lambda) and the
         # next to last statement is a "yield". Then we want to
@@ -661,35 +654,8 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
             ast[-1] = ast_expr
             pass
     else:
-                self.write("(")
+        self.write("(", ", ".join(params))
-                pass
+    # self.println(indent, '#flags:\t', int(code.co_flags))
-
-        last_line = self.f.getvalue().split("\n")[-1]
-        l = len(last_line)
-        indent = ' ' * l
-        line_number = self.line_number
-
-        if code_has_star_arg(code):
-            self.write('*%s' % code.co_varnames[argc + kw_pairs])
-            argc += 1
-
-        i = len(paramnames) - len(defparams)
-        self.write(", ".join(paramnames[:i]))
-        if i > 0:
-            suffix = ', '
-        else:
-            suffix = ''
-        for n in node:
-            if n == 'pos_arg':
-                self.write(suffix)
-                self.write(paramnames[i] + '=')
-                i += 1
-                self.preorder(n)
-                if (line_number != self.line_number):
-                    suffix = ",\n" + indent
-                    line_number = self.line_number
-                else:
-                    suffix = ', '
 
     ends_in_comma = False
     if kw_args > 0: