diff --git a/borg/archive.py b/borg/archive.py index bf65d49ee..4804df154 100644 --- a/borg/archive.py +++ b/borg/archive.py @@ -67,7 +67,7 @@ def backup_io(): raise BackupOSError(os_error) from os_error -def input_io_iter(iterator): +def backup_io_iter(iterator): while True: try: with backup_io(): @@ -552,7 +552,7 @@ Number of files: {0.stats.nfiles}'''.format( uid, gid = 0, 0 fd = sys.stdin.buffer # binary chunks = [] - for chunk in input_io_iter(self.chunker.chunkify(fd)): + for chunk in backup_io_iter(self.chunker.chunkify(fd)): chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats)) self.stats.nfiles += 1 t = int_to_bigint(int(time.time()) * 1000000000) @@ -604,7 +604,7 @@ Number of files: {0.stats.nfiles}'''.format( fh = Archive._open_rb(path) with os.fdopen(fh, 'rb') as fd: chunks = [] - for chunk in input_io_iter(self.chunker.chunkify(fd, fh)): + for chunk in backup_io_iter(self.chunker.chunkify(fd, fh)): chunks.append(cache.add_chunk(self.key.id_hash(chunk), chunk, self.stats)) if self.show_progress: self.stats.show_progress(item=item, dt=0.2) diff --git a/borg/testsuite/archive.py b/borg/testsuite/archive.py index 2b3961be5..2dbdd7bc8 100644 --- a/borg/testsuite/archive.py +++ b/borg/testsuite/archive.py @@ -5,7 +5,7 @@ import msgpack import pytest from ..archive import Archive, CacheChunkBuffer, RobustUnpacker, valid_msgpacked_dict, ITEM_KEYS -from ..archive import BackupOSError, backup_io, input_io_iter +from ..archive import BackupOSError, backup_io, backup_io_iter from ..key import PlaintextKey from ..helpers import Manifest from . import BaseTestCase @@ -164,9 +164,9 @@ def test_backup_io_iter(): oserror_iterator = Iterator(OSError) with pytest.raises(BackupOSError): - for _ in input_io_iter(oserror_iterator): + for _ in backup_io_iter(oserror_iterator): pass normal_iterator = Iterator(StopIteration) - for _ in input_io_iter(normal_iterator): + for _ in backup_io_iter(normal_iterator): assert False, 'StopIteration handled incorrectly'