diff options
author | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-03-04 21:10:38 +0000 |
---|---|---|
committer | bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2003-03-04 21:10:38 +0000 |
commit | 1d98cd8af3761cb473fe4ebbbdee60109a1b757a (patch) | |
tree | 930d100911360eb8ad46f5a50ce14fd68d7dd2cc /rdiff-backup/rdiff_backup/rorpiter.py | |
parent | 28cff11744e0ad52a37edc79c9fdd0d748c41e8d (diff) | |
download | rdiff-backup-1d98cd8af3761cb473fe4ebbbdee60109a1b757a.tar.gz |
Final checkin for 0.11.3 (fixed pipeline flushing problem)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@292 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/rorpiter.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/rorpiter.py | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/rdiff-backup/rdiff_backup/rorpiter.py b/rdiff-backup/rdiff_backup/rorpiter.py index fda06e5..7db4fea 100644 --- a/rdiff-backup/rdiff_backup/rorpiter.py +++ b/rdiff-backup/rdiff_backup/rorpiter.py @@ -33,48 +33,6 @@ import os, tempfile, UserList, types import Globals, rpath, iterfile -class RORPIterException(Exception): pass - -def ToRaw(rorp_iter): - """Convert a rorp iterator to raw form""" - for rorp in rorp_iter: - if rorp.file: - yield (rorp.index, rorp.data, 1) - yield rorp.file - else: yield (rorp.index, rorp.data, 0) - -def FromRaw(raw_iter): - """Convert raw rorp iter back to standard form""" - for index, data, num_files in raw_iter: - rorp = rpath.RORPath(index, data) - if num_files: - assert num_files == 1, "Only one file accepted right now" - rorp.setfile(get_next_file(raw_iter)) - yield rorp - -class ErrorFile: - """Used by get_next_file below, file-like that just raises error""" - def __init__(self, exc): - """Initialize new ErrorFile. exc is the exception to raise on read""" - self.exc = exc - def read(self, l=-1): raise self.exc - def close(self): return None - -def get_next_file(iter): - """Return the next element of an iterator, raising error if none""" - try: next = iter.next() - except StopIteration: raise RORPIterException("Unexpected end to iter") - if isinstance(next, Exception): return ErrorFile(next) - return next - -def ToFile(rorp_iter): - """Return file version of iterator""" - return iterfile.FileWrappingIter(ToRaw(rorp_iter)) - -def FromFile(fileobj): - """Recover rorp iterator from file interface""" - return FromRaw(iterfile.IterWrappingFile(fileobj)) - def CollateIterators(*rorp_iters): """Collate RORPath iterators by index |