Skip to content
Snippets Groups Projects
Commit e8e3ff37 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

Refactoring: use single assignment for "if, else"

See for reference:
https://docs.sourcery.ai/Reference/Python/Default-Rules/assign-if-exp/
parent 14eaf45a
No related branches found
No related tags found
1 merge request!294Refactoring: use single assignment for "if, else"
Pipeline #72210 skipped with stage
...@@ -16,7 +16,6 @@ rule_settings: ...@@ -16,7 +16,6 @@ rule_settings:
- replace-interpolation-with-fstring - replace-interpolation-with-fstring
- use-fstring-for-concatenation - use-fstring-for-concatenation
- merge-dict-assign - merge-dict-assign
- assign-if-exp
- remove-redundant-if - remove-redundant-if
- switch - switch
- low-code-quality - low-code-quality
......
...@@ -51,9 +51,7 @@ class Project: ...@@ -51,9 +51,7 @@ class Project:
) )
def __eq__(self, p): def __eq__(self, p):
if not p: return self.project.id == p.project.id if p else False
return False
return self.project.id == p.project.id
class Tag: class Tag:
...@@ -167,9 +165,7 @@ class Release: ...@@ -167,9 +165,7 @@ class Release:
def description(self): def description(self):
m = self.tag.message m = self.tag.message
if not m: return m or ""
return ""
return m
def __str__(self): def __str__(self):
return self.tag.name return self.tag.name
......
...@@ -46,9 +46,7 @@ class Project: ...@@ -46,9 +46,7 @@ class Project:
) )
def __eq__(self, p): def __eq__(self, p):
if not p: return self.project.id == p.project.id if p else False
return False
return self.project.id == p.project.id
class Tag: class Tag:
...@@ -162,9 +160,7 @@ class Release: ...@@ -162,9 +160,7 @@ class Release:
def description(self): def description(self):
m = self.tag.message m = self.tag.message
if not m: return m or ""
return ""
return m
def __str__(self): def __str__(self):
return self.tag.name return self.tag.name
......
...@@ -250,21 +250,15 @@ class LavaDevice: ...@@ -250,21 +250,15 @@ class LavaDevice:
@property @property
def serial(self): def serial(self):
if self._serial is None: return self._serial.name if self._serial is not None else ""
return ""
return self._serial.name
@property @property
def hw_revision(self): def hw_revision(self):
if self._hw_revision is None: return self._hw_revision.name if self._hw_revision is not None else ""
return ""
return self._hw_revision.name
@property @property
def article_no(self): def article_no(self):
if self._article_no is None: return self._article_no.name if self._article_no is not None else ""
return ""
return self._article_no.name
def __lt__(self, other): def __lt__(self, other):
return self.name < other.name return self.name < other.name
......
...@@ -36,16 +36,12 @@ class TestCollection: ...@@ -36,16 +36,12 @@ class TestCollection:
return "" return ""
tests = self.tests[machine] tests = self.tests[machine]
out = ["{:.2f}".format(float(t.measurement)) for t in tests] out = ["{:.2f}".format(float(t.measurement)) for t in tests]
if not out: return "/".join(out) if out else None
return None
return "/".join(out)
@property @property
def name(self): def name(self):
t = self.get_test() t = self.get_test()
if t is None: return t.name if t is not None else self.test_case_id
return self.test_case_id
return t.name
# Sort alphabetically # Sort alphabetically
def __lt__(self, other): def __lt__(self, other):
...@@ -55,9 +51,7 @@ class TestCollection: ...@@ -55,9 +51,7 @@ class TestCollection:
keys = list(self.tests.keys()) keys = list(self.tests.keys())
if not keys: if not keys:
return None return None
if len(self.tests[keys[index]]) < 1: return None if len(self.tests[keys[index]]) < 1 else self.tests[keys[index]][0]
return None
return self.tests[keys[index]][0]
def get_result(self, machine): def get_result(self, machine):
if machine not in self.tests.keys(): if machine not in self.tests.keys():
......
...@@ -138,14 +138,10 @@ class MarkDownTable: ...@@ -138,14 +138,10 @@ class MarkDownTable:
return "MarkDownTable (" + self.length + " rows)" return "MarkDownTable (" + self.length + " rows)"
def get_alignment(self, col): def get_alignment(self, col):
if col < len(self.alignment): return self.alignment[col] if col < len(self.alignment) else self.alignment[-1]
return self.alignment[col]
return self.alignment[-1]
def get_column_width(self, col): def get_column_width(self, col):
if col < len(self.column_width): return self.column_width[col] + 2 if col < len(self.column_width) else 60
return self.column_width[col] + 2
return 60
def get_column_count(self): def get_column_count(self):
max_cols = 0 max_cols = 0
......
...@@ -23,12 +23,8 @@ def call(cmd, stdout=None): ...@@ -23,12 +23,8 @@ def call(cmd, stdout=None):
else: else:
result = subprocess.run(cmd, stdout=stdout, check=True) result = subprocess.run(cmd, stdout=stdout, check=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
out = "" out = e.stdout.decode() if e.stdout is not None else ""
err = "" err = e.stderr.decode() if e.stderr is not None else ""
if e.stdout is not None:
out = e.stdout.decode()
if e.stderr is not None:
err = e.stderr.decode()
logging.error("Command failed %s: %s %s", cmd, out, err) logging.error("Command failed %s: %s %s", cmd, out, err)
exit(1) exit(1)
if result is not None and result.stdout is not None: if result is not None and result.stdout is not None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment