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

Make pylint happy

Browse Source 
Updated pylint on Travis-CI is slightly stricter.
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-22 18:00:28 +01:00
parent 796a3d43ae
commit c82d5b0a73
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/pylintrc
View File

@ -1,11 +1,14 @@
[MASTER] [MASTER]
persistent=no persistent=no
ignore=tests ignore=tests
extension-pkg-whitelist=lxml.etree
[MESSAGES CONTROL] [MESSAGES CONTROL]
# abstract-class-little-used: see http://www.logilab.org/ticket/111138 # abstract-class-little-used: see http://www.logilab.org/ticket/111138
disable= disable=
bad-continuation, bad-continuation,
raising-format-tuple,
inconsistent-return-statements,
duplicate-code, duplicate-code,
fixme, fixme,
locally-disabled, locally-disabled,

10
qubesadmin/backup/restore.py
View File

@ -531,7 +531,7 @@ class ExtractWorker3(Process):
def __run__(self): def __run__(self):
self.log.debug("Started sending thread") self.log.debug("Started sending thread")
self.log.debug("Moving to dir " + self.base_dir) self.log.debug("Moving to dir %s", self.base_dir)
os.chdir(self.base_dir) os.chdir(self.base_dir)
filename = None filename = None
@ -543,7 +543,7 @@ class ExtractWorker3(Process):
assert isinstance(filename, str) assert isinstance(filename, str)
self.log.debug("Extracting file " + filename) self.log.debug("Extracting file %s", filename)
if filename.endswith('.000'): if filename.endswith('.000'):
# next file # next file
@ -587,7 +587,7 @@ class ExtractWorker3(Process):
tar2_cmdline.insert(-1, "--use-compress-program=%s" % tar2_cmdline.insert(-1, "--use-compress-program=%s" %
DEFAULT_COMPRESSION_FILTER) DEFAULT_COMPRESSION_FILTER)
self.log.debug("Running command " + str(tar2_cmdline)) self.log.debug("Running command %s", str(tar2_cmdline))
if self.encrypted: if self.encrypted:
# Start decrypt # Start decrypt
self.decryptor_process = subprocess.Popen( self.decryptor_process = subprocess.Popen(
@ -880,7 +880,7 @@ class BackupRestore(object):
tar1_env = os.environ.copy() tar1_env = os.environ.copy()
tar1_env['UPDATES_MAX_BYTES'] = str(limit_bytes) tar1_env['UPDATES_MAX_BYTES'] = str(limit_bytes)
tar1_env['UPDATES_MAX_FILES'] = str(limit_count) tar1_env['UPDATES_MAX_FILES'] = str(limit_count)
self.log.debug("Run command" + str(tar1_command)) self.log.debug("Run command %s", str(tar1_command))
command = subprocess.Popen( command = subprocess.Popen(
tar1_command, tar1_command,
stdin=backup_stdin, stdin=backup_stdin,
@ -1777,7 +1777,7 @@ class BackupRestore(object):
if self.options.verify_only: if self.options.verify_only:
raise raise
else: else:
self.log.error('Error extracting data: ' + str(err)) self.log.error('Error extracting data: %s', str(err))
finally: finally:
if self.log.getEffectiveLevel() > logging.DEBUG: if self.log.getEffectiveLevel() > logging.DEBUG:
shutil.rmtree(self.tmpdir) shutil.rmtree(self.tmpdir)