from __future__ import absolute_import, print_function
import errno, os, stat, struct, tempfile
-from bup import compat, metadata, xstat
+from bup import metadata, xstat
from bup._helpers import UINT_MAX, bytescmp
-from bup.compat import range
+from bup.compat import pending_raise, range
from bup.helpers import (add_error, log, merge_iter, mmap_readwrite,
progress, qprogress, resolve_parent, slashappend)
self._file.close()
self._file = None
- def __del__(self):
- self.close()
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ with pending_raise(value, rethrow=True):
+ self.close()
def metadata_at(self, ofs):
self._file.seek(ofs)
except EOFError:
pass
except:
- log('index metadata in %r appears to be corrupt' % filename)
+ log('index metadata in %r appears to be corrupt\n' % filename)
raise
finally:
m_file.close()
self._file.close()
self._file = None
- def __del__(self):
- # Be optimistic.
- self.close()
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ with pending_raise(value, rethrow=False):
+ self.close()
def store(self, metadata):
meta_encoded = metadata.encode(include_path=False)
(ofs,n) = (f.tell(), len(self.list))
if self.list:
count = len(self.list)
- #log('popping %r with %d entries\n'
+ #log('popping %r with %d entries\n'
# % (''.join(self.ename), count))
for e in self.list:
e.write(f)
class Entry:
def __init__(self, basename, name, meta_ofs, tmax):
- assert basename is None or type(basename) == bytes
- assert name is None or type(name) == bytes
+ assert basename is None or isinstance(basename, bytes)
+ assert name is None or isinstance(name, bytes)
self.basename = basename
self.name = name
self.meta_ofs = meta_ofs
log('pack error: %s (%r)\n' % (e, self))
raise
- def stale(self, st, tstart, check_device=True):
+ def stale(self, st, check_device=True):
if self.size != st.st_size:
return True
if self.mtime != st.st_mtime:
return True
if check_device and (self.dev != st.st_dev):
return True
- # Check that the ctime's "second" is at or after tstart's.
- ctime_sec_in_ns = xstat.fstime_floor_secs(st.st_ctime) * 10**9
- if ctime_sec_in_ns >= tstart:
- return True
return False
def update_from_stat(self, st, meta_ofs):
def __eq__(self, other):
return self._cmp(other) == 0
- def __ne__():
+ def __ne__(self, other):
return self._cmp(other) != 0
def __lt__(self, other):
def __gt__(self, other):
return self._cmp(other) > 0
- def __le__():
+ def __le__(self, other):
return self._cmp(other) <= 0
- def __ge__():
+ def __ge__(self, other):
return self._cmp(other) >= 0
def write(self, f):
def __iter__(self):
return self.iter()
-
+
class Reader:
def __init__(self, filename):
def _add(self, ename, entry):
if self.lastfile and self.lastfile <= ename:
- raise Error('%r must come before %r'
+ raise Error('%r must come before %r'
% (''.join(ename), ''.join(self.lastfile)))
self.lastfile = ename
self.level = _golevel(self.level, self.f, ename, entry,
paths = []
prev = None
for (rp, p) in xpaths:
- if prev and (prev == rp
+ if prev and (prev == rp
or (prev.endswith(b'/') and rp.startswith(prev))):
continue # already superceded by previous path
paths.append((rp, p))