Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/general.py
diff options
context:
space:
mode:
authorVarun Madiath <vamega@gmail.com>2020-10-19 22:59:30 -0400
committerVarun Madiath <vamega@gmail.com>2020-10-19 23:07:35 -0400
commit5ded22a5d0f5fb1cf1d4d95945f655e8b6a33896 (patch)
tree4e2b46493fadf9cf777e9371545a2e93d1510b17 /archinstall/lib/general.py
parente4f363ce7dbd6ec27a30123caf262c99452a0dd4 (diff)
Fix some PEP-8 errors.
Diffstat (limited to 'archinstall/lib/general.py')
-rw-r--r--archinstall/lib/general.py31
1 files changed, 17 insertions, 14 deletions
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index d9b0c147..abcf25f0 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -73,9 +73,10 @@ class sys_command():#Thread):
Stolen from archinstall_gui
"""
def __init__(self, cmd, callback=None, start_callback=None, *args, **kwargs):
- if not 'worker_id' in kwargs: kwargs['worker_id'] = gen_uid()
- if not 'emulate' in kwargs: kwargs['emulate'] = False
- if not 'suppress_errors' in kwargs: kwargs['suppress_errors'] = False
+ kwargs.setdefault("worker_id", gen_uid())
+ kwargs.setdefault("emulate", False)
+ kwargs.setdefault("suppress_errors", False)
+
if kwargs['emulate']:
log(f"Starting command '{cmd}' in emulation mode.")
self.raw_cmd = cmd
@@ -85,7 +86,8 @@ class sys_command():#Thread):
raise ValueError(f'Incorrect string to split: {cmd}\n{e}')
self.args = args
self.kwargs = kwargs
- if not 'worker' in self.kwargs: self.kwargs['worker'] = None
+
+ self.kwargs.setdefault("worker", None)
self.callback = callback
self.pid = None
self.exit_code = None
@@ -110,7 +112,8 @@ class sys_command():#Thread):
if not os.path.isdir(self.exec_dir):
os.makedirs(self.exec_dir)
- if start_callback: start_callback(self, *args, **kwargs)
+ if start_callback:
+ start_callback(self, *args, **kwargs)
self.run()
def __iter__(self, *args, **kwargs):
@@ -125,14 +128,14 @@ class sys_command():#Thread):
def dump(self):
return {
- 'status' : self.status,
- 'worker_id' : self.worker_id,
- 'worker_result' : self.trace_log.decode('UTF-8'),
- 'started' : self.started,
- 'ended' : self.ended,
- 'started_pprint' : '{}-{}-{} {}:{}:{}'.format(*time.localtime(self.started)),
- 'ended_pprint' : '{}-{}-{} {}:{}:{}'.format(*time.localtime(self.ended)) if self.ended else None,
- 'exit_code' : self.exit_code
+ 'status': self.status,
+ 'worker_id': self.worker_id,
+ 'worker_result': self.trace_log.decode('UTF-8'),
+ 'started': self.started,
+ 'ended': self.ended,
+ 'started_pprint': '{}-{}-{} {}:{}:{}'.format(*time.localtime(self.started)),
+ 'ended_pprint': '{}-{}-{} {}:{}:{}'.format(*time.localtime(self.ended)) if self.ended else None,
+ 'exit_code': self.exit_code
}
def run(self):
@@ -255,4 +258,4 @@ def prerequisite_check():
return True
def reboot():
- o = b''.join(sys_command(("/usr/bin/reboot"))) \ No newline at end of file
+ o = b''.join(sys_command("/usr/bin/reboot"))