fix for exe mode imports -- ignores package-prefix entirely and does the right thing. Fixes issue #257

Author: Randall C. O'Reilly

bind/gen.go

@@ -633,10 +633,14 @@ func (g *pyGen) genPyWrapPreamble() {
 				impgenstr += fmt.Sprintf("import %s\n", name)
 			}
 		}
+	case g.mode == ModeExe:
+		// exe mode ignores PkgPrefix, because it is always built in to exe
+		impgenstr += fmt.Sprintf("import _%s\n", g.cfg.Name)
+		impgenstr += fmt.Sprintf("from %s import go\n", g.cfg.Name)
 	default:
-		pkg := "." + g.cfg.Name
+		pkg := g.cfg.Name
 		if g.cfg.PkgPrefix != "" {
-			pkg = g.cfg.PkgPrefix + pkg
+			pkg = g.cfg.PkgPrefix + "." + pkg
 		}
 		for _, name := range impgenNames {
 			impgenstr += fmt.Sprintf("from %s import %s\n", pkg, name)

bind/symbols.go

@@ -76,7 +76,7 @@ func (k symkind) String() string {
 }
 
 var pyKeywords = map[string]struct{}{
-	"False": struct{}{}, "None": struct{}{}, "True": struct{}{}, "and": struct{}{}, "as": struct{}{}, "assert": struct{}{}, "break": struct{}{}, "class": struct{}{}, "continue": struct{}{}, "def": struct{}{}, "del": struct{}{}, "elif": struct{}{}, "else": struct{}{}, "except": struct{}{}, "finally": struct{}{}, "for": struct{}{}, "from": struct{}{}, "global": struct{}{}, "if": struct{}{}, "import": struct{}{}, "in": struct{}{}, "is": struct{}{}, "lambda": struct{}{}, "nonlocal": struct{}{}, "not": struct{}{}, "or": struct{}{}, "pass": struct{}{}, "raise": struct{}{}, "return": struct{}{}, "try": struct{}{}, "while": struct{}{}, "with": struct{}{}, "yield": struct{}{},
+	"False": struct{}{}, "None": struct{}{}, "True": struct{}{}, "and": struct{}{}, "as": struct{}{}, "assert": struct{}{}, "break": struct{}{}, "class": struct{}{}, "continue": struct{}{}, "def": struct{}{}, "del": struct{}{}, "elif": struct{}{}, "else": struct{}{}, "except": struct{}{}, "finally": struct{}{}, "for": struct{}{}, "from": struct{}{}, "global": struct{}{}, "if": struct{}{}, "import": struct{}{}, "in": struct{}{}, "is": struct{}{}, "lambda": struct{}{}, "nonlocal": struct{}{}, "not": struct{}{}, "or": struct{}{}, "pass": struct{}{}, "raise": struct{}{}, "return": struct{}{}, "try": struct{}{}, "while": struct{}{}, "with": struct{}{}, "yield": struct{}{}, "self": struct{}{},
 }
 
 // pySafeName returns a name that python will not barf on

cmd_exe.go

@@ -45,8 +45,8 @@ ex:
 	cmd.Flag.String("name", "", "name of output package (otherwise name of first package is used)")
 	cmd.Flag.String("main", "", "code string to run in the go main() function in the cgo library "+
 		"-- defaults to GoPyMainRun() but typically should be overriden")
-	cmd.Flag.String("package-prefix", ".", "custom package prefix used when generating import "+
-		"statements for generated package")
+	// cmd.Flag.String("package-prefix", ".", "custom package prefix used when generating import "+
+	// 	"statements for generated package")
 	cmd.Flag.Bool("rename", false, "rename Go symbols to python PEP snake_case")
 	cmd.Flag.Bool("symbols", true, "include symbols in output")
 	cmd.Flag.String("exclude", "", "comma-separated list of package names to exclude")
@@ -74,7 +74,8 @@ func gopyRunCmdExe(cmdr *commander.Command, args []string) error {
 	cfg.Name = cmdr.Flag.Lookup("name").Value.Get().(string)
 	cfg.Main = cmdr.Flag.Lookup("main").Value.Get().(string)
 	cfg.VM = cmdr.Flag.Lookup("vm").Value.Get().(string)
-	cfg.PkgPrefix = cmdr.Flag.Lookup("package-prefix").Value.Get().(string)
+	// cfg.PkgPrefix = cmdr.Flag.Lookup("package-prefix").Value.Get().(string)
+	cfg.PkgPrefix = "" // doesn't make sense for exe
 	cfg.RenameCase = cmdr.Flag.Lookup("rename").Value.Get().(bool)
 	cfg.Symbols = cmdr.Flag.Lookup("symbols").Value.Get().(bool)
 	cfg.NoWarn = cmdr.Flag.Lookup("no-warn").Value.Get().(bool)