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

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 <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 724bc43e4b81acf8446cfde3ca6c490f5534e3f0..7393ee25050891d1002bd09a13202b5b165d6bf6 100644 (file)
--- 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
        cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF &&
        import marshal
        import sys

+       instream = getattr(sys.stdin, 'buffer', sys.stdin)

        for i in range($line):
        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"
 }
        EOF
        "$PYTHON_PATH" "$TRASH_DIRECTORY/marshal-dump.py"
 }

diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 66d3fc91a739a7f04bb73694a2f5d75034045d10..eb9a8ed197b4c6383a4c688f5e5c3a3fcb102b12 100755 (executable)
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -223,12 +223,12 @@ build_gendouble() {
        import sys
        import struct
 
        import sys
        import struct
 

-       s = struct.pack(">LL18s",
+       s = struct.pack(b">LL18s",

                        0x00051607,  # AppleDouble
                        0x00020000,  # version 2
                        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
 }
 
        EOF
 }