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)
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)
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
self.m[st.st_size - FOOTLEN
: st.st_size])[0]
- def __del__(self):
- self.close()
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ with pending_raise(value, rethrow=False):
+ self.close()
def __len__(self):
return int(self.count)
self.f = os.fdopen(ffd, 'wb', 65536)
self.f.write(INDEX_HDR)
- def __del__(self):
- self.abort()
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ with pending_raise(value, rethrow=False):
+ self.abort()
def abort(self):
f = self.f