particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

objectstore: remove context manager for new method

Browse source 
Turn `ObjectStore.new` into a plain method, since `Object` itself
can be used as a context manager, which is now directly returned,
instead of internally wrapped in a `with` statement and then
yielded. Thus for callers of the method nothing changes and the
behavior of `with objectstore.new() as x` is exactly the same.
This commit is contained in:
Christian Kellner 2020-03-05 17:47:03 +01:00 • committed by Tom Gundersen
parent b28ec66f5a
commit 01d989e718
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
osbuild/objectstore.py
View file

@ -235,28 +235,27 @@ class ObjectStore:
with obj.read() as path:
yield path
@contextlib.contextmanager
def new(self, base_id=None):
"""Creates a new temporary `Object`.
This method must be used as a context manager. It returns
a temporary instance of `Object`, which can then be used
for interaction with the store.
It returns a temporary instance of `Object`, the base
optionally set to `base_id`. It can be used to interact
with the store.
If changes to the object's content were made (by calling
`Object.write`), these must manually be committed to the
store via `commit()`.
"""
with Object(self) as obj:
obj = Object(self)
if base_id:
# if we were given a base id then this is the base
# content for the new object
# NB: `Object` has copy-on-write semantics, so no
# copying of the data takes places at this point
obj.base = base_id
if base_id:
# if we were given a base id then this is the base
# content for the new object
# NB: `Object` has copy-on-write semantics, so no
# copying of the data takes places at this point
obj.base = base_id
yield obj
return obj
def commit(self, obj: Object, object_id: str) -> str:
"""Commits a Object to the object store