git-p4 tests: work with python3 as well as python2

luked99 · gitster · commit 84096814a82e · 2016-04-26T10:48:13.000-07:00
Update the git-p4 tests so that they work with both
Python2 and Python3.

We have to be explicit about the difference between
Unicode text strings (Python3 default) and raw binary
strings which will be exchanged with Perforce.

Additionally, print always takes parentheses in Python3.

Signed-off-by: Luke Diamand &lt;luke@diamand.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
@@ -198,9 +198,10 @@ marshal_dump() {
 	cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF &&
 	import marshal
 	import sys
+	instream = getattr(sys.stdin, 'buffer', sys.stdin)
 	for i in range($line):
-	    d = marshal.load(sys.stdin)
-	print d['$what']
+	    d = marshal.load(instream)
+	print(d[b'$what'].decode('utf-8'))
 	EOF
 	"$PYTHON_PATH" "$TRASH_DIRECTORY/marshal-dump.py"
 }
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
@@ -223,12 +223,12 @@ build_gendouble() {
 	import sys
 	import struct
 
-	s = struct.pack(">LL18s",
+	s = struct.pack(b">LL18s",
 			0x00051607,  # AppleDouble
 			0x00020000,  # version 2
-			""           # pad to 26 bytes
+			b""          # pad to 26 bytes
 	)
-	sys.stdout.write(s)
+	getattr(sys.stdout, 'buffer', sys.stdout).write(s)
 	EOF
 }
 

Original file line number	Diff line number	Diff line change
`@@ -223,12 +223,12 @@ build_gendouble() {`
`223`	`223`	`import sys`
`224`	`224`	`import struct`
`225`	`225`
`226`		`- s = struct.pack(">LL18s",`
	`226`	`+ s = struct.pack(b">LL18s",`
`227`	`227`	`0x00051607, # AppleDouble`
`228`	`228`	`0x00020000, # version 2`
`229`		`- "" # pad to 26 bytes`
	`229`	`+ b"" # pad to 26 bytes`
`230`	`230`	`)`
`231`		`- sys.stdout.write(s)`
	`231`	`+ getattr(sys.stdout, 'buffer', sys.stdout).write(s)`
`232`	`232`	`EOF`
`233`	`233`	`}`
`234`	`234`