if renaming case, use lower-case string() method instead of String() --

fixes #337
go-python · Apr 22, 2024 · 9dde376 · 9dde376
1 parent 4aba380
commit 9dde376
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/bind/gen.go b/bind/gen.go
@@ -863,3 +863,13 @@ func (g *pyGen) genGoPkg() {
 		g.genType(sym, false, false) // not exttypes
 	}
 }
+
+// genStringerCall generates a call to either self.String() or self.string()
+// depending on RenameCase option
+func (g *pyGen) genStringerCall() {
+	if g.cfg.RenameCase {
+		g.pywrap.Printf("return self.string()\n")
+	} else {
+		g.pywrap.Printf("return self.String()\n")
+	}
+}
diff --git a/bind/gen_map.go b/bind/gen_map.go
@@ -134,7 +134,7 @@ otherwise parameter is a python list that we copy from
 				if isStringer(m.obj) {
 					g.pywrap.Printf("def __str__(self):\n")
 					g.pywrap.Indent()
-					g.pywrap.Printf("return self.String()\n")
+					g.genStringerCall()
 					g.pywrap.Outdent()
 					g.pywrap.Printf("\n")
 				}

diff --git a/bind/gen_slice.go b/bind/gen_slice.go
@@ -129,7 +129,7 @@ otherwise parameter is a python list that we copy from
 				if isStringer(m.obj) {
 					g.pywrap.Printf("def __str__(self):\n")
 					g.pywrap.Indent()
-					g.pywrap.Printf("return self.String()\n")
+					g.genStringerCall()
 					g.pywrap.Outdent()
 				}
 			}

diff --git a/bind/gen_struct.go b/bind/gen_struct.go
@@ -101,7 +101,7 @@ in which case a new Go object is constructed first
 			}
 			g.pywrap.Printf("def __str__(self):\n")
 			g.pywrap.Indent()
-			g.pywrap.Printf("return self.String()\n")
+			g.genStringerCall()
 			g.pywrap.Outdent()
 			g.pywrap.Printf("\n")
 		}
@@ -345,7 +345,7 @@ handle=A Go-side object is always initialized with an explicit handle=arg
 		}
 		g.pywrap.Printf("def __str__(self):\n")
 		g.pywrap.Indent()
-		g.pywrap.Printf("return self.String()\n")
+		g.genStringerCall()
 		g.pywrap.Outdent()
 		g.pywrap.Printf("\n")
 	}