Verfied generated python code, atleast for smaller ret-counts.

Author: nishant-rudderstack

bind/gen_func.go

@@ -200,14 +200,11 @@ func (g *pyGen) genFuncSig(sym *symbol, fsym *Func) bool {
 	}
 
 	if len(goArgs) > 0 {
-		gstr := strings.Join(goArgs, ", ")
-		g.gofile.Printf("%v) %v", gstr, goRet)
+		g.gofile.Printf("%v) %v", strings.Join(goArgs, ", "), goRet)
 
-		pstr := strings.Join(pyArgs, ", ")
-		g.pybuild.Printf(", [%v])\n", pstr)
+		g.pybuild.Printf(", [%v])\n", strings.Join(pyArgs, ", "))
 
-		wstr := strings.Join(wpArgs, ", ")
-		g.pywrap.Printf("%v)", wstr)
+		g.pywrap.Printf("%v)", strings.Join(wpArgs, ", "))
 
 	} else {
 		g.gofile.Printf(") %v", goRet)
@@ -254,9 +251,6 @@ func (g *pyGen) genFuncBody(sym *symbol, fsym *Func) {
 
 	pkgname := g.cfg.Name
 
-	_, gdoc, _ := extractPythonName(fsym.GoName(), fsym.Doc())
-	ifchandle, gdoc := isIfaceHandle(gdoc)
-
 	sig := fsym.Signature()
 	res := sig.Results()
 	args := sig.Params()
@@ -271,6 +265,9 @@ func (g *pyGen) genFuncBody(sym *symbol, fsym *Func) {
 		}
 	}
 
+	_, gdoc, _ := extractPythonName(fsym.GoName(), fsym.Doc())
+	ifchandle, gdoc := isIfaceHandle(gdoc)
+
 	g.pywrap.Printf(":\n")
 	g.pywrap.Indent()
 	g.pywrap.Printf(`"""%s"""`, gdoc)
@@ -402,8 +399,9 @@ if __err != nil {
 		g.pywrap.Printf(pyFuncCall)
 	}
 
-	g.pywrap.Printf("\n\n")
+	g.pywrap.Printf("\n")
 	g.pywrap.Outdent()
+	g.pywrap.Printf("\n")
 
 	goFuncCall := ""
 	if isMethod {

bind/package.go

@@ -241,7 +241,18 @@ func (p *Package) getDoc(parent string, o types.Object) string {
 		}
 
 		params := parseFn(sig.Params())
-		results := parseFn(sig.Results())
+
+		res := sig.Results()
+		results := parseFn(res)
+
+		if (len(results) > 0) {
+			lastResult := res.At(len(results)-1)
+			if isErrorType(lastResult.Type()) {
+				if !NoPyExceptions {
+				        results = results[0:len(results)-1]
+				}
+			}
+		}
 
 		paramString := strings.Join(params, ", ")
 		resultString := strings.Join(results, ", ")