summaryrefslogtreecommitdiff
path: root/t/t9802-git-p4-filetype.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:45:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:45:42 -0700
commitca158f4633e40fb8a6e7e6b78dc7ad559718a19b (patch)
treee1ad86c75391478273f05cbc2e09c16b2857358c /t/t9802-git-p4-filetype.sh
parentMerge branch 'sb/config-exit-status-list' (diff)
parentgit-p4 tests: time_in_seconds should use $PYTHON_PATH (diff)
downloadtgif-ca158f4633e40fb8a6e7e6b78dc7ad559718a19b.tar.xz
Merge branch 'ld/p4-test-py3'
The test scripts for "git p4" (but not "git p4" implementation itself) has been updated so that they would work even on a system where the installed version of Python is python 3. * ld/p4-test-py3: git-p4 tests: time_in_seconds should use $PYTHON_PATH git-p4 tests: work with python3 as well as python2 git-p4 tests: cd to / before running python
Diffstat (limited to 't/t9802-git-p4-filetype.sh')
-rwxr-xr-xt/t9802-git-p4-filetype.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 66d3fc91a7..eb9a8ed197 100755
--- 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
}