linting

NanoVNASaver/Formatting.py

@@ -115,17 +115,13 @@ def format_complex_adm(z: complex, allow_negative: bool = False) -> str:
         return "- S"
     adm = 1/z
 
-    fmt_re = FMT_COMPLEX
+    fmt_re = FMT_COMPLEX_NEG if allow_negative else FMT_COMPLEX
-    if allow_negative:
-        fmt_re = FMT_COMPLEX_NEG
     re = SITools.Value(adm.real, fmt=fmt_re)
     im = SITools.Value(abs(adm.imag), fmt=FMT_COMPLEX)
     return f"{re}{'-' if adm.imag < 0 else '+'}j{im} S"
 
 def format_complex_imp(z: complex, allow_negative: bool = False) -> str:
-    fmt_re = FMT_COMPLEX
+    fmt_re = FMT_COMPLEX_NEG if allow_negative else FMT_COMPLEX
-    if allow_negative:
-        fmt_re = FMT_COMPLEX_NEG
     re = SITools.Value(z.real, fmt=fmt_re)
     im = SITools.Value(abs(z.imag), fmt=FMT_COMPLEX)
     return f"{re}{'-' if z.imag < 0 else '+'}j{im} ""\N{OHM SIGN}"

NanoVNASaver/Hardware/TinySA.py

@@ -114,11 +114,5 @@ class TinySA(VNA):
     def readValues(self, value) -> List[str]:
         logger.debug("Read: %s", value)
         if value == "data 0":
-            self._sweepdata = []
+            self._sweepdata = [f"0 {line.strip()}" for line in self.exec_command("data")]
-            for line in self.exec_command("data"):
-                self._sweepdata.append(f"0 {line.strip()}")
         return self._sweepdata
-        if value == "data 0":
-            return [x[0] for x in self._sweepdata]
-        if value == "data 1":
-            return [x[0] for x in self._sweepdata]

NanoVNASaver/Hardware/VNA.py

@@ -141,9 +141,8 @@ class VNA:
             return [1000, ]
 
     def set_bandwidth(self, bandwidth: int):
-        bw_val = bandwidth
+        bw_val = DISLORD_BW[bandwidth] \
-        if self.bw_method == "dislord":
+            if self.bw_method == "dislord" else bandwidth
-            bw_val = DISLORD_BW[bandwidth]
         result = " ".join(self.exec_command(f"bandwidth {bw_val}"))
         if self.bw_method == "ttrftech" and result:
             raise IOError(f"set_bandwith({bandwidth}: {result}")

NanoVNASaver/Settings/Bands.py

@@ -62,10 +62,10 @@ class BandsModel(QtCore.QAbstractTableModel):
         self.settings.setIniCodec("UTF-8")
 
         self.enabled = self.settings.value("ShowBands", False, bool)
-        self.bands = []
+        self.bands = [
-
+            band.split(";")
-        for band in self.settings.value("bands", _DEFAULT_BANDS):
+            for band in self.settings.value("bands", _DEFAULT_BANDS)
-            self.bands.append(band.split(";"))
+        ]
 
     def saveSettings(self):
         self.settings.setValue(
@@ -74,9 +74,7 @@ class BandsModel(QtCore.QAbstractTableModel):
         self.settings.sync()
 
     def resetBands(self):
-        self.bands = []
+        self.bands = [band.split(";") for band in _DEFAULT_BANDS]
-        for band in _DEFAULT_BANDS:
-            self.bands.append(band.split(";"))
         self.layoutChanged.emit()
         self.saveSettings()
 
@@ -87,8 +85,9 @@ class BandsModel(QtCore.QAbstractTableModel):
         return len(self.bands)
 
     def data(self, index: QModelIndex, role: int = ...) -> QtCore.QVariant:
-        if (role == QtCore.Qt.DisplayRole or
+        if role in [
-                role == QtCore.Qt.ItemDataRole or role == QtCore.Qt.EditRole):
+            QtCore.Qt.DisplayRole, QtCore.Qt.ItemDataRole, QtCore.Qt.EditRole,
+        ]:
             return QtCore.QVariant(self.bands[index.row()][index.column()])
         if role == QtCore.Qt.TextAlignmentRole:
             if index.column() == 0:

NanoVNASaver/Settings/Sweep.py

@@ -85,11 +85,13 @@ class Sweep():
         return round(self.span / (self.points  * self.segments - 1))
 
     def check(self):
-        if not(self.segments > 0 and
+        if (
-               self.points > 0 and
+            self.segments <= 0
-               self.start > 0 and
+            or self.points <= 0
-               self.end > 0 and
+            or self.start <= 0
-               self.stepsize >= 1):
+            or self.end <= 0
+            or self.stepsize < 1
+        ):
             raise ValueError(f"Illegal sweep settings: {self}")
 
     def _exp_factor(self, index: int) -> float:

NanoVNASaver/Windows/About.py

@@ -154,7 +154,7 @@ class AboutWindow(QtWidgets.QWidget):
         latest_url = ""
         try:
             req = request.Request(VERSION_URL)
-            req.add_header('User-Agent', "NanoVNA-Saver/" + self.app.version)
+            req.add_header('User-Agent', f'NanoVNA-Saver/{self.app.version}')
             for line in request.urlopen(req, timeout=3):
                 line = line.decode("utf-8")
                 if line.startswith("VERSION ="):