mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-01 12:45:34 +00:00
Code Issues Releases Wiki Activity

Move code block for the write() function at do_list()

Browse source
This commit is contained in:
Abogical 2016-06-20 00:02:12 +03:00
parent 9a64835b4d
commit 0942bcd1b4
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/borg/archiver.py
View file

@ -738,6 +738,14 @@ def do_mount(self, args, repository, manifest, key):
@with_repository() @with_repository()
def do_list(self, args, repository, manifest, key): def do_list(self, args, repository, manifest, key):
"""List archive or repository contents""" """List archive or repository contents"""
if not hasattr(sys.stdout, 'buffer'):
# This is a shim for supporting unit tests replacing sys.stdout with e.g. StringIO,
# which doesn't have an underlying buffer (= lower file object).
def write(bytestring):
sys.stdout.write(bytestring.decode('utf-8', errors='replace'))
else:
write = sys.stdout.buffer.write
if args.location.archive: if args.location.archive:
matcher, _ = self.build_matcher(args.excludes, args.paths) matcher, _ = self.build_matcher(args.excludes, args.paths)
with Cache(repository, key, manifest, lock_wait=self.lock_wait) as cache: with Cache(repository, key, manifest, lock_wait=self.lock_wait) as cache:
@ -751,13 +759,6 @@ def do_list(self, args, repository, manifest, key):
format = "{mode} {user:6} {group:6} {size:8} {isomtime} {path}{extra}{NL}" format = "{mode} {user:6} {group:6} {size:8} {isomtime} {path}{extra}{NL}"
formatter = ItemFormatter(archive, format) formatter = ItemFormatter(archive, format)
if not hasattr(sys.stdout, 'buffer'):
# This is a shim for supporting unit tests replacing sys.stdout with e.g. StringIO,
# which doesn't have an underlying buffer (= lower file object).
def write(bytestring):
sys.stdout.write(bytestring.decode('utf-8', errors='replace'))
else:
write = sys.stdout.buffer.write
for item in archive.iter_items(lambda item: matcher.match(item.path)): for item in archive.iter_items(lambda item: matcher.match(item.path)):
write(safe_encode(formatter.format_item(item))) write(safe_encode(formatter.format_item(item)))
else: else: