join_bytes: pass the join() args correctly for py3

[bup.git] / lib / bup / rm.py

diff --git a/lib/bup/rm.py b/lib/bup/rm.py
index dfcdc019c415b189563dc1c9d4f385f8897e9c07..d0e0551402ad6860e856b15dbff54c4552551e7f 100644 (file)
--- a/lib/bup/rm.py
+++ b/lib/bup/rm.py
@@ -1,8 +1,8 @@
 
+from __future__ import absolute_import
 import sys
 
-from bup import git
-from bup import vfs2 as vfs
+from bup import compat, git, vfs
 from bup.client import ClientError
 from bup.git import get_commit_items
 from bup.helpers import add_error, die_if_errors, log, saved_errors
@@ -68,7 +68,7 @@ def dead_items(repo, paths):
     # Scan for bad requests, and opportunities to optimize
     for path in paths:
         try:
-            resolved = vfs.lresolve(repo, path)
+            resolved = vfs.resolve(repo, path, follow=False)
         except vfs.IOError as e:
             add_error(e)
             continue
@@ -104,7 +104,7 @@ def bup_rm(repo, paths, compression=6, verbosity=None):
 
     updated_refs = {}  # ref_name -> (original_ref, tip_commit(bin))
 
-    for branchname, branchitem in dead_branches.iteritems():
+    for branchname, branchitem in compat.items(dead_branches):
         ref = 'refs/heads/' + branchname
         assert(not ref in updated_refs)
         updated_refs[ref] = (branchitem.oid, None)
@@ -112,7 +112,7 @@ def bup_rm(repo, paths, compression=6, verbosity=None):
     if dead_saves:
         writer = git.PackWriter(compression_level=compression)
         try:
-            for branch, saves in dead_saves.iteritems():
+            for branch, saves in compat.items(dead_saves):
                 assert(saves)
                 updated_refs['refs/heads/' + branch] = rm_saves(saves, writer)
         except:
@@ -127,7 +127,7 @@ def bup_rm(repo, paths, compression=6, verbosity=None):
     # Only update the refs here, at the very end, so that if something
     # goes wrong above, the old refs will be undisturbed.  Make an attempt
     # to update each ref.
-    for ref_name, info in updated_refs.iteritems():
+    for ref_name, info in compat.items(updated_refs):
         orig_ref, new_ref = info
         try:
             if not new_ref: