tgit: use print() for python 3; fix test data writes

Fix a couple of places with

  print f, ...

that actually meant

  print >> f, ...

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/t/tgit.py b/lib/bup/t/tgit.py
index 599aaf6c4ab1976b13f4938cb777a17d1aac73f2..bcc58bd01819cfa815492a5b8743899f1231d7e9 100644 (file)
--- a/lib/bup/t/tgit.py
+++ b/lib/bup/t/tgit.py
@@ -1,5 +1,5 @@
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 from subprocess import check_call
 import struct, os, time
 
@@ -17,13 +17,13 @@ bup_exe = top_dir + '/bup'
 
 def exc(*cmd):
     cmd_str = ' '.join(cmd)
-    print >> sys.stderr, cmd_str
+    print(cmd_str, file=sys.stderr)
     check_call(cmd)
 
 
 def exo(*cmd):
     cmd_str = ' '.join(cmd)
-    print >> sys.stderr, cmd_str
+    print(cmd_str, file=sys.stderr)
     return readpipe(cmd)
 
 
@@ -104,12 +104,12 @@ def testpacks():
                 hashes.append(w.new_blob(str(i)))
             log('\n')
             nameprefix = w.close()
-            print repr(nameprefix)
+            print(repr(nameprefix))
             WVPASS(os.path.exists(nameprefix + '.pack'))
             WVPASS(os.path.exists(nameprefix + '.idx'))
 
             r = git.open_idx(nameprefix + '.idx')
-            print repr(r.fanout)
+            print(repr(r.fanout))
 
             for i in range(nobj):
                 WVPASS(r.find_offset(hashes[i]) > 0)
@@ -252,7 +252,7 @@ def test_commit_parsing():
                 git.check_repo_or_die(repodir)
                 os.chdir(workdir)
                 with open('foo', 'w') as f:
-                    print >> f, 'bar'
+                    print('bar', file=f)
                 readpipe(['git', 'add', '.'])
                 readpipe(['git', 'commit', '-am', 'Do something',
                           '--author', 'Someone <someone@somewhere>',
@@ -281,7 +281,7 @@ def test_commit_parsing():
                 WVPASSEQ(commit_items.committer_offset, coff)
                 WVPASSEQ(commit_items.message, 'Do something\n')
                 with open('bar', 'w') as f:
-                    print >> f, 'baz'
+                    print('baz', file=f)
                 readpipe(['git', 'add', '.'])
                 readpipe(['git', 'commit', '-am', 'Do something else'])
                 child = readpipe(['git', 'show-ref', '-s', 'master']).strip()
@@ -369,9 +369,9 @@ def test_list_refs():
             src = tmpdir + '/src'
             mkdirp(src)
             with open(src + '/1', 'w+') as f:
-                print f, 'something'
+                print('something', file=f)
             with open(src + '/2', 'w+') as f:
-                print f, 'something else'
+                print('something else', file=f)
             git.init_repo(bupdir)
             emptyset = frozenset()
             WVPASSEQ(frozenset(git.list_refs()), emptyset)
@@ -428,9 +428,9 @@ def test_cat_pipe():
             src = tmpdir + '/src'
             mkdirp(src)
             with open(src + '/1', 'w+') as f:
-                print f, 'something'
+                print('something', file=f)
             with open(src + '/2', 'w+') as f:
-                print f, 'something else'
+                print('something else', file=f)
             git.init_repo(bupdir)
             exc(bup_exe, 'index', src)
             oidx = exo(bup_exe, 'save', '-cn', 'src', '--strip', src).strip()