Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/callback: fix issues detected by pylint

Browse Source
This commit is contained in:
3hhh 2020-07-05 19:44:30 +02:00
parent 529e4bfbbf
commit 43fca80a5b
No known key found for this signature in database
GPG Key ID: EB03A691DB2F0833
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/storage/callback.py
View File

@ -427,12 +427,13 @@ class CallbackVolume(qubes.storage.Volume):
:param pool: `CallbackPool` of this volume :param pool: `CallbackPool` of this volume
:param impl: `qubes.storage.Volume` object to wrap :param impl: `qubes.storage.Volume` object to wrap
''' '''
# pylint: disable=super-init-not-called
#NOTE: we must *not* call super().__init__() as it would prevent attribute delegation
assert isinstance(impl, qubes.storage.Volume), 'impl must be a qubes.storage.Volume instance. Found a %s instance.' % impl.__class__ assert isinstance(impl, qubes.storage.Volume), 'impl must be a qubes.storage.Volume instance. Found a %s instance.' % impl.__class__
assert isinstance(pool, CallbackPool), 'pool must use a qubes.storage.CallbackPool instance. Found a %s instance.' % pool.__class__ assert isinstance(pool, CallbackPool), 'pool must use a qubes.storage.CallbackPool instance. Found a %s instance.' % pool.__class__
impl.pool = pool #enforce the CallbackPool instance as the parent pool of the volume impl.pool = pool #enforce the CallbackPool instance as the parent pool of the volume
self._cb_pool = pool #: CallbackPool instance the Volume belongs to. self._cb_pool = pool #: CallbackPool instance the Volume belongs to.
self._cb_impl = impl #: Backend volume implementation instance. self._cb_impl = impl #: Backend volume implementation instance.
#NOTE: we must *not* call super().__init__() as it would prevent attribute delegation
@asyncio.coroutine @asyncio.coroutine
def _assert_initialized(self, **kwargs): def _assert_initialized(self, **kwargs):
@ -480,10 +481,10 @@ class CallbackVolume(qubes.storage.Volume):
return ret return ret
@asyncio.coroutine @asyncio.coroutine
def import_data(self): def import_data(self, size):
yield from self._assert_initialized() yield from self._assert_initialized()
yield from self._callback('pre_volume_import_data') yield from self._callback('pre_volume_import_data', cb_args=[size])
return (yield from coro_maybe(self._cb_impl.import_data())) return (yield from coro_maybe(self._cb_impl.import_data(size)))
@asyncio.coroutine @asyncio.coroutine
def import_data_end(self, success): def import_data_end(self, success):
@ -534,12 +535,12 @@ class CallbackVolume(qubes.storage.Volume):
return None return None
return self._cb_impl.block_device() return self._cb_impl.block_device()
def export(self, volume): def export(self):
# pylint: disable=protected-access # pylint: disable=protected-access
#TODO: once this becomes a coroutine in the Volume class, avoid the below blocking & potentially exception-throwing code; maybe also add a callback #TODO: once this becomes a coroutine in the Volume class, avoid the below blocking & potentially exception-throwing code; maybe also add a callback
if self._cb_pool._cb_requires_init: if self._cb_pool._cb_requires_init:
self._cb_pool._init_nocoro() self._cb_pool._init_nocoro()
return self._cb_impl.export(volume) return self._cb_impl.export()
@asyncio.coroutine @asyncio.coroutine
def verify(self): def verify(self):