fix for loop _, and update tests.

Author: Randall C. O'Reilly

gotopy.go

@@ -80,6 +80,13 @@ func initParserMode() {
 	if *allErrors {
 		parserMode |= parser.AllErrors
 	}
+	if *gopyMode {
+		printerMode |= pyprint.GoPy
+	}
+
+	if *gogiMode {
+		printerMode |= pyprint.GoGi | pyprint.GoPy
+	}
 }
 
 func isGoFile(f os.FileInfo) bool {
@@ -227,14 +234,6 @@ func gofmtMain() {
 		return
 	}
 
-	if *gopyMode {
-		printerMode |= pyprint.GoPy
-	}
-
-	if *gogiMode {
-		printerMode |= pyprint.GoGi | pyprint.GoPy
-	}
-
 	for i := 0; i < flag.NArg(); i++ {
 		path := flag.Arg(i)
 		switch dir, err := os.Stat(path); {

gotopy_test.go

@@ -79,6 +79,11 @@ func runTest(t *testing.T, in, out string) {
 			*rewriteRule = value
 		case "-s":
 			*simplifyAST = true
+		case "-gopy":
+			*gopyMode = true
+		case "-gogi":
+			*gopyMode = true
+			*gogiMode = true
 		case "-stdin":
 			// fake flag - pretend input is from stdin
 			stdin = true

pyedits.go

@@ -138,6 +138,8 @@ func pyEditsReplace(lines [][]byte) {
 	eqappend := []byte("= append(")
 	elseif := []byte("else if")
 	elif := []byte("elif")
+	forblank := []byte("for _, ")
+	fornoblank := []byte("for ")
 	itoa := []byte("strconv.Itoa")
 	float64p := []byte("float64(")
 	float32p := []byte("float32(")
@@ -162,6 +164,7 @@ func pyEditsReplace(lines [][]byte) {
 		ln = bytes.Replace(ln, float64p, floatp, -1)
 		ln = bytes.Replace(ln, float32p, floatp, -1)
 		ln = bytes.Replace(ln, stringp, strp, -1)
+		ln = bytes.Replace(ln, forblank, fornoblank, -1)
 
 		if bytes.Contains(ln, fmtSprintf) {
 			if bytes.Contains(ln, []byte("%")) {

testdata/basic.golden

@@ -6,50 +6,56 @@ GlobBool     = False
 
 class MyStru:
 # A struct definition
-	def __init__(self):
-	# field desc
-		self.A int
-		self.B float32 # `desc:"field tag"`
-		self.C string  # `desc:"more tags"`
-	def MethOne(st, arg1):
-		"""
-		MethOne does something
-		"""
-		rv = st.A
-		for _, a in SomeList :
-			rv += a
-		st.A = True
-
-		ano = MyStru(A= 22, B= 44.2, C= "happy")
-
-		return rv
-
-	def MethTwo(st, arg1, arg2, arg3):
-		"""
-		MethTwo does something
-		it is pretty cool
-		not really sure about that
-		"""
-		rv = st.A
-		for a in range(100):
-			rv += a
-		switch rv:
-		if 100:
-			rv *= 2
-		if 500:
-			rv /= 5
-		return rv
+    """
+    A struct definition
+
+# field desc
+    """
+
+    def __init__(self):
+        self.A = int()
+        self.B = float() # `desc:"field tag"`
+        self.C = str()  # `desc:"more tags"`
+
+    def MethOne(st, arg1):
+        """
+        MethOne does something
+        """
+        rv = st.A
+        for a in SomeList :
+            rv += a
+        st.A = True
+
+        ano = MyStru(A= 22, B= 44.2, C= "happy")
+
+        return rv
+
+    def MethTwo(st, arg1, arg2, arg3):
+        """
+        MethTwo does something
+        it is pretty cool
+        not really sure about that
+        """
+        rv = st.A
+        for a in range(100):
+            rv += a
+        switch rv:
+        if 100:
+            rv *= 2
+        if 500:
+            rv /= 5
+        return rv
 
 
 # A global function
 def GlobFun(a, b):
-	"""
-	A global function
-	"""
-	if a > b and a == 0 or b == 0:
-		return a + b
-	else if a == b:
-		return a * b
-	else:
-		return a - b
+    """
+    A global function
+    """
+    if a > b and a == 0 or b == 0:
+        return a + b
+    elif a == b:
+        return a * b
+    else:
+        return a - b