most of PR review comments addressed -- few more to tackle tmrw. haven't changed import paths yet b/c still working out of my dir -- will do that as a last step.

Author: Randall C. O'Reilly

LICENSE

@@ -1,4 +1,4 @@
-Copyright ©2019 The go-python Authors. All rights reserved.
+Copyright ©2015 The go-python Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.md

@@ -57,9 +57,9 @@ gopy -
 
 Commands:
 
-    pkg         generate and compile Python bindings for go, automatically including subdirs
+    pkg         generate and compile Python bindings for Go, automatically including subdirs
                     also creates all the python files needed to install module
-    exe         like pkg but makes a standalone executable with go packages bultin
+    exe         like pkg but makes a standalone executable with Go packages bultin
                     this is particularly useful when using -main arg to start process on
     gen         generate (C)Python language bindings for Go
     build       generate and compile 
@@ -71,7 +71,7 @@ Use "gopy help <command>" for more information about a command.
 $ gopy help pkg
 Usage: gopy pkg <go-package-name> [other-go-package...]
 
-pkg generates and compiles (C)Python language bindings for a Go package, including subdirectories, and generates python module packaging suitable for distribution.  if setup.py file does not yet exist in the target directory, then it along with other default packaging files are created, using arguments.  Typically you create initial default versions of these files and then edit them, and after that, only regenerate the go binding files.
+pkg generates and compiles (C)Python language bindings for a Go package, including subdirectories, and generates python module packaging suitable for distribution.  if setup.py file does not yet exist in the target directory, then it is created along with other default packaging files, using arguments.  Typically you create initial default versions of these files and then edit them, and after that, only regenerate the Go binding files.
 
 ex:
  $ gopy pkg [options] <go-package-name> [other-go-package...]
@@ -82,7 +82,7 @@ Options:
   -desc="": short description of project (long comes from README.md)
   -email="gopy@example.com": author email
   -exclude="": comma-separated list of package names to exclude
-  -main="": code string to run in the go GoPyInit() function in the cgo library
+  -main="": code string to run in the Go GoPyInit() function in the cgo library
   -name="": name of output package (otherwise name of first package is used)
   -output="": output directory for root of package
   -symbols=true: include symbols in output
@@ -95,7 +95,7 @@ Options:
 $ gopy help exe
 Usage: gopy exe <go-package-name> [other-go-package...]
 
-exe generates and compiles (C)Python language bindings for a Go package, including subdirectories, and generates a standalone python executable and associated module packaging suitable for distribution.  if setup.py file does not yet exist in the target directory, then it along with other default packaging files are created, using arguments.  Typically you create initial default versions of these files and then edit them, and after that, only regenerate the go binding files.
+exe generates and compiles (C)Python language bindings for a Go package, including subdirectories, and generates a standalone python executable and associated module packaging suitable for distribution.  if setup.py file does not yet exist in the target directory, then it along with other default packaging files are created, using arguments.  Typically you create initial default versions of these files and then edit them, and after that, only regenerate the Go binding files.
 
 The primary need for an exe instead of a pkg dynamic library is when the main thread must be used for something other than running the python interpreter, such as for a GUI library where the main thread must be used for running the GUI event loop (e.g., GoGi).
 
@@ -108,7 +108,7 @@ Options:
   -desc="": short description of project (long comes from README.md)
   -email="gopy@example.com": author email
   -exclude="": comma-separated list of package names to exclude
-  -main="": code string to run in the go main() function in the cgo library -- defaults to GoPyMainRun() but typically should be overriden
+  -main="": code string to run in the Go main() function in the cgo library -- defaults to GoPyMainRun() but typically should be overriden
   -name="": name of output package (otherwise name of first package is used)
   -output="": output directory for root of package
   -symbols=true: include symbols in output
@@ -127,7 +127,7 @@ ex:
  $ gopy gen github.com/go-python/gopy/_examples/hi
 
 Options:
-  -main="": code string to run in the go main() function in the cgo library
+  -main="": code string to run in the Go main() function in the cgo library
   -name="": name of output package (otherwise name of first package is used)
   -output="": output directory for bindings
   -vm="python": path to python interpreter
@@ -142,7 +142,7 @@ ex:
  $ gopy build github.com/go-python/gopy/_examples/hi
 
 Options:
-  -main="": code string to run in the go main() function in the cgo library
+  -main="": code string to run in the Go main() function in the cgo library
   -name="": name of output package (otherwise name of first package is used)
   -output="": output directory for bindings
   -symbols=true: include symbols in output

_examples/funcs/__pycache__/test.cpython-36.pyc

@@ -15,20 +15,20 @@ type FunStruct struct {
 	FieldS string
 }
 
-func (fs *FunStruct) CallBack(arg1 int, fun func(afs *FunStruct, a1 int, s1 string)) {
-	fun(fs, arg1, fs.FieldS)
+func (fs *FunStruct) CallBack(i int, fun func(fs *FunStruct, i int, s string)) {
+	fun(fs, i, fs.FieldS)
 }
 
-type RecvFunc func(afs *FunStruct, a1 int, if1 interface{})
+type RecvFunc func(fs *FunStruct, i int, v interface{})
 
-func (fs *FunStruct) CallBackIf(arg1 int, fun RecvFunc) {
-	fun(fs, arg1, fs.FieldS)
+func (fs *FunStruct) CallBackIf(i int, fun RecvFunc) {
+	fun(fs, i, fs.FieldS)
 }
 
-func (fs *FunStruct) OtherMeth(arg1 int, args string) {
-	fs.FieldI = arg1
-	fs.FieldS = args
-	fmt.Printf("arg1: %d args: %s\n", arg1, args)
+func (fs *FunStruct) OtherMeth(i int, s string) {
+	fs.FieldI = i
+	fs.FieldS = s
+	fmt.Printf("i=%d s=%s\n", i, s)
 }
 
 func (fs *FunStruct) ObjArg(ofs *FunStruct) {

_examples/funcs/funcs.go

@@ -54,7 +54,7 @@ def CallSelf(self):
 print("fs.ObjArg with fs")
 fs.ObjArg(fs)
 
-# todo: not currently supported:
+# TODO: not currently supported:
 
 # print("funcs.F1()...")
 # f1 = funcs.F1()

_examples/funcs/test.py

@@ -130,20 +130,20 @@ func (p *Person) GetAge() int {
 	return p.Age
 }
 
-func (p *Person) SetName(nm string) {
-	p.Name = nm
+func (p *Person) SetName(n string) {
+	p.Name = n
 }
 
-func (p *Person) SetAge(ag int) {
-	p.Age = ag
+func (p *Person) SetAge(age int) {
+	p.Age = age
 }
 
-func (p *Person) SetFmS2(s2arg structs.S2) {
-	p.Age = s2arg.Public
+func (p *Person) SetFmS2(s2 structs.S2) {
+	p.Age = s2.Public
 }
 
-func (p *Person) SetFmS2Ptr(s2arg *structs.S2) {
-	p.Age = s2arg.Public
+func (p *Person) SetFmS2Ptr(s2 *structs.S2) {
+	p.Age = s2.Public
 }
 
 func (p *Person) ReturnS2Ptr() *structs.S2 {
@@ -178,7 +178,7 @@ type Floats []Float
 // Eval evals float64
 type Eval func(f float64) float64
 
-// PersIface is an interface into the person type
+// PersIface is an interface into the person type.
 type PersIface interface {
 	// GetName returns the name of the person
 	GetName() string
@@ -187,7 +187,7 @@ type PersIface interface {
 	GetAge() int
 
 	// SetName sets name
-	SetName(nm string)
+	SetName(n string)
 
 	// SetAge sets age
 	SetAge(age int)

_examples/hi/hi.go

@@ -6,6 +6,9 @@
 
 import hi
 
+# NOTE: the output from python2 is different from that of 3, and test
+# targets python3 so it appears to fail for 2.
+
 print("--- doc(hi)...")
 print(hi.__doc__)
 
@@ -167,6 +170,8 @@
 
 ## test Couple.__init__
 print("--- Couple.__init__")
+# Note: pybindgen does not automatically support varargs, so in general
+# all python calls need to provide the full Go signature of args.
 #c = hi.Couple(hi.Person("p1", 42))
 #print(c)
 c = hi.Couple(hi.Person("p1", 42), hi.Person("p2", 52))

_examples/hi/test.py

@@ -36,7 +36,8 @@ func IfaceString(str interface{}) {
 	cpkg.Printf("iface as string: %v\n", str)
 }
 
-//gopy:interface=handle this magic directive says, treat it as a handle
+//gopy:interface=handle
+// this magic directive says, treat the interface arg as a handle
 func IfaceHandle(ifc interface{}) {
 	cpkg.Printf("iface as handle: %v\n", ifc)
 }

_examples/iface/iface.go

@@ -29,7 +29,7 @@
 print('map a[1]:', a[1])
 print('map a[2]:', a[2])
 
-# todo: not sure why python2 doesn't just catch this error, but it doesn't seem to..
+# TODO: not sure why python2 doesn't just catch this error, but it doesn't seem to..
 # try:
 #     v = a[4]
 # except Exception as err:

_examples/maps/test.py

@@ -5,7 +5,7 @@
 // package named tests various aspects of named types.
 package named
 
-// todo: not dealing with named basic types -- not very intuitive to use
+// TODO: not dealing with named basic types -- not very intuitive to use
 // in python, as they have to become classes.  instead anything like this
 // is converted to its basic type when used as an arg / return value
 // so you can use them in other methods, but their special type methods

_examples/named/named.go

@@ -21,7 +21,7 @@
 bytestr = b"Python byte string"
 unicodestr = u"Python Unicode string 🐱"
 
-# todo: need conversion from bytestr to string -- not sure pybindgen can do it?
+# TODO: need conversion from bytestr to string -- not sure pybindgen can do it?
 #bytestr_ret = encoding.HandleString(bytestr)
 unicodestr_ret = encoding.HandleString(unicodestr)