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

Make pylint happy

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-04-21 02:47:23 +02:00
parent b6d06d856d
commit 275a53e545
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
7 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmgmt/base.py
View File

@ -70,7 +70,7 @@ class PropertyHolder(object):
raise appropriate exception. raise appropriate exception.
''' '''
if len(response_data) == 0: if response_data == b'':
raise qubesmgmt.exc.QubesDaemonNoResponseError( raise qubesmgmt.exc.QubesDaemonNoResponseError(
'Got empty response from qubesd') 'Got empty response from qubesd')

3
qubesmgmt/storage.py
View File

@ -90,7 +90,6 @@ class Volume(object):
'''Storage volume pool name.''' '''Storage volume pool name.'''
if self._pool is not None: if self._pool is not None:
return self._pool return self._pool
else:
self._fetch_info() self._fetch_info()
return str(self._info['pool']) return str(self._info['pool'])
@ -99,7 +98,6 @@ class Volume(object):
'''Storage volume id, unique within given pool.''' '''Storage volume id, unique within given pool.'''
if self._vid is not None: if self._vid is not None:
return self._vid return self._vid
else:
self._fetch_info() self._fetch_info()
return str(self._info['vid']) return str(self._info['vid'])
@ -142,7 +140,6 @@ class Volume(object):
self._fetch_info() self._fetch_info()
if self._info['source']: if self._info['source']:
return self._info['source'] return self._info['source']
else:
return None return None
@property @property

9
qubesmgmt/tools/__init__.py
View File

@ -219,7 +219,7 @@ class VolumeAction(QubesAction):
pool = app.pools[pool_name] pool = app.pools[pool_name]
volume = [v for v in pool.volumes if v.vid == vid] volume = [v for v in pool.volumes if v.vid == vid]
assert volume > 1, 'Duplicate vids in pool %s' % pool_name assert volume > 1, 'Duplicate vids in pool %s' % pool_name
if len(volume) == 0: if not volume:
parser.error_runtime( parser.error_runtime(
'no volume with id {!r} pool: {!r}'.format(vid, 'no volume with id {!r} pool: {!r}'.format(vid,
pool_name)) pool_name))
@ -348,7 +348,7 @@ class QubesArgumentParser(argparse.ArgumentParser):
self.set_defaults(verbose=1, quiet=0) self.set_defaults(verbose=1, quiet=0)
def parse_args(self, *args, **kwargs): def parse_args(self, *args, **kwargs): # pylint: disable=arguments-differ
# hack for tests # hack for tests
app = kwargs.pop('app', None) app = kwargs.pop('app', None)
namespace = super(QubesArgumentParser, self).parse_args(*args, **kwargs) namespace = super(QubesArgumentParser, self).parse_args(*args, **kwargs)
@ -424,9 +424,8 @@ class AliasedSubParsersAction(argparse._SubParsersAction):
super(AliasedSubParsersAction._AliasedPseudoAction, self).\ super(AliasedSubParsersAction._AliasedPseudoAction, self).\
__init__(option_strings=[], dest=dest, help=help) __init__(option_strings=[], dest=dest, help=help)
def __call__(self, **kwargs): def __call__(self, parser, namespace, values, option_string=None):
super(AliasedSubParsersAction._AliasedPseudoAction, self).__call__( pass
**kwargs)
def add_parser(self, name, **kwargs): def add_parser(self, name, **kwargs):
if 'aliases' in kwargs: if 'aliases' in kwargs:

1
qubesmgmt/tools/qvm_ls.py
View File

@ -228,7 +228,6 @@ class StatusColumn(Column):
if ret is not None: if ret is not None:
if getattr(vm, 'hvm', False): if getattr(vm, 'hvm', False):
return ret.upper() return ret.upper()
else:
return ret return ret

2
qubesmgmt/tools/qvm_run.py
View File

@ -149,7 +149,7 @@ def main(args=None, app=None):
if not args.autostart and not vm.is_running(): if not args.autostart and not vm.is_running():
continue continue
try: try:
log.info('Running {!r} on {!s}'.format(args.cmd, vm.name)) log.info('Running \'%s\' on %s', args.cmd, vm.name)
if args.passio and not args.localcmd: if args.passio and not args.localcmd:
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
loop.add_signal_handler(signal.SIGCHLD, loop.stop) loop.add_signal_handler(signal.SIGCHLD, loop.stop)

2
qubesmgmt/tools/qvm_volume.py
View File

@ -72,7 +72,7 @@ class VolumeData(object):
def __init__(self, volume): def __init__(self, volume):
self.pool = volume.pool self.pool = volume.pool
self.vid = volume.vid self.vid = volume.vid
if len(volume.revisions) > 0: if volume.revisions:
self.revisions = 'Yes' self.revisions = 'Yes'
else: else:
self.revisions = 'No' self.revisions = 'No'

4
qubesmgmt/utils.py
View File

@ -81,7 +81,6 @@ def mbytes_to_kmg(size):
'''Convert mbytes to human readable format.''' '''Convert mbytes to human readable format.'''
if size > 1024: if size > 1024:
return "%d GiB" % (size / 1024) return "%d GiB" % (size / 1024)
else:
return "%d MiB" % size return "%d MiB" % size
@ -89,7 +88,6 @@ def kbytes_to_kmg(size):
'''Convert kbytes to human readable format.''' '''Convert kbytes to human readable format.'''
if size > 1024: if size > 1024:
return mbytes_to_kmg(size / 1024) return mbytes_to_kmg(size / 1024)
else:
return "%d KiB" % size return "%d KiB" % size
@ -97,7 +95,6 @@ def bytes_to_kmg(size):
'''Convert bytes to human readable format.''' '''Convert bytes to human readable format.'''
if size > 1024: if size > 1024:
return kbytes_to_kmg(size / 1024) return kbytes_to_kmg(size / 1024)
else:
return "%d B" % size return "%d B" % size
@ -109,7 +106,6 @@ def size_to_human(size):
return str(round(size / 1024.0, 1)) + ' KiB' return str(round(size / 1024.0, 1)) + ' KiB'
elif size < 1024 * 1024 * 1024: elif size < 1024 * 1024 * 1024:
return str(round(size / (1024.0 * 1024), 1)) + ' MiB' return str(round(size / (1024.0 * 1024), 1)) + ' MiB'
else:
return str(round(size / (1024.0 * 1024 * 1024), 1)) + ' GiB' return str(round(size / (1024.0 * 1024 * 1024), 1)) + ' GiB'