Fix tindex for python 3

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

diff --git a/lib/bup/ls.py b/lib/bup/ls.py
index 78717ac1dc2d4072f6f830537350b12e1f004ddf..4a05b397cfc0a77c12f443321797d1efed752c37 100644 (file)
--- a/lib/bup/ls.py
+++ b/lib/bup/ls.py
@@ -1,14 +1,14 @@
 """Common code for listing files from a bup repository."""
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 from itertools import chain
 from stat import S_ISDIR, S_ISLNK
-import copy, locale, os.path, stat, sys, xstat
+import copy, locale, os.path, stat, sys
 
-from bup import metadata, options, vfs
+from bup import metadata, options, vfs, xstat
 from bup.options import Options
 from bup.repo import LocalRepo, RemoteRepo
-from helpers import columnate, istty1, last, log
+from bup.helpers import columnate, istty1, last, log
 
 def item_hash(item, tree_for_commit):
     """If the item is a Commit, return its commit oid, otherwise return
@@ -113,7 +113,7 @@ def within_repo(repo, opt):
     for path in opt.paths:
         try:
             if opt.directory:
-                resolved = vfs.lresolve(repo, path)
+                resolved = vfs.resolve(repo, path, follow=False)
             else:
                 resolved = vfs.try_resolve(repo, path)