fixing a few linter errors.

meshtastic/node.py

@@ -143,129 +143,6 @@ class Node:
         """Block until radio config is received. Returns True if config has been received."""
         return self._timeout.waitForSet(self, attrs=("localConfig", attribute))
 
-    def writeConfig(self):
-        """Write the current (edited) localConfig to the device"""
-        if self.localConfig is None:
-            our_exit("Error: No localConfig has been read")
-
-        if self.localConfig.device:
-            p = admin_pb2.AdminMessage()
-            p.set_config.device.CopyFrom(self.localConfig.device)
-            self._sendAdmin(p)
-            logging.debug("Wrote device")
-            time.sleep(0.3)
-
-        if self.localConfig.position:
-            p = admin_pb2.AdminMessage()
-            p.set_config.position.CopyFrom(self.localConfig.position)
-            self._sendAdmin(p)
-            logging.debug("Wrote position")
-            time.sleep(0.3)
-
-        if self.localConfig.power:
-            p = admin_pb2.AdminMessage()
-            p.set_config.power.CopyFrom(self.localConfig.power)
-            self._sendAdmin(p)
-            logging.debug("Wrote power")
-            time.sleep(0.3)
-
-        if self.localConfig.network:
-            p = admin_pb2.AdminMessage()
-            p.set_config.network.CopyFrom(self.localConfig.network)
-            self._sendAdmin(p)
-            logging.debug("Wrote network")
-            time.sleep(0.3)
-
-        if self.localConfig.display:
-            p = admin_pb2.AdminMessage()
-            p.set_config.display.CopyFrom(self.localConfig.display)
-            self._sendAdmin(p)
-            logging.debug("Wrote display")
-            time.sleep(0.3)
-
-        if self.localConfig.lora:
-            p = admin_pb2.AdminMessage()
-            p.set_config.lora.CopyFrom(self.localConfig.lora)
-            self._sendAdmin(p)
-            logging.debug("Wrote lora")
-            time.sleep(0.3)
-
-        if self.localConfig.bluetooth:
-            p = admin_pb2.AdminMessage()
-            p.set_config.bluetooth.CopyFrom(self.localConfig.bluetooth)
-            self._sendAdmin(p)
-            logging.debug("Wrote bluetooth")
-            time.sleep(0.3)
-
-        if self.moduleConfig.mqtt:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.mqtt.CopyFrom(self.moduleConfig.mqtt)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: mqtt")
-            time.sleep(0.3)
-
-        if self.moduleConfig.serial:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.serial.CopyFrom(self.moduleConfig.serial)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: serial")
-            time.sleep(0.3)
-
-        if self.moduleConfig.external_notification:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.external_notification.CopyFrom(
-                self.moduleConfig.external_notification
-            )
-            self._sendAdmin(p)
-            logging.debug("Wrote module: external_notification")
-            time.sleep(0.3)
-
-        if self.moduleConfig.store_forward:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.store_forward.CopyFrom(self.moduleConfig.store_forward)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: store_forward")
-            time.sleep(0.3)
-
-        if self.moduleConfig.range_test:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.range_test.CopyFrom(self.moduleConfig.range_test)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: range_test")
-            time.sleep(0.3)
-
-        if self.moduleConfig.telemetry:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.telemetry.CopyFrom(self.moduleConfig.telemetry)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: telemetry")
-            time.sleep(0.3)
-
-        if self.moduleConfig.canned_message:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.canned_message.CopyFrom(
-                self.moduleConfig.canned_message
-            )
-            self._sendAdmin(p)
-            logging.debug("Wrote module: canned_message")
-            time.sleep(0.3)
-
-        if self.moduleConfig.audio:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.audio.CopyFrom(self.moduleConfig.audio)
-            self._sendAdmin(p)
-            logging.debug("Wrote module: audio")
-            time.sleep(0.3)
-
-        if self.moduleConfig.remote_hardware:
-            p = admin_pb2.AdminMessage()
-            p.set_module_config.remote_hardware.CopyFrom(
-                self.moduleConfig.remote_hardware
-            )
-            self._sendAdmin(p)
-            logging.debug("Wrote module: remote_hardware")
-            time.sleep(0.3)
-
     def writeConfig(self, config_name):
         """Write the current (edited) localConfig to the device"""
         if self.localConfig is None:

meshtastic/tests/test_node.py

@@ -773,7 +773,7 @@ def test_writeConfig_with_no_radioConfig(capsys):
     anode = Node("foo", "bar", noProto=True)
 
     with pytest.raises(SystemExit) as pytest_wrapped_e:
-        anode.writeConfig()
+        anode.writeConfig('foo')
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
     out, err = capsys.readouterr()

meshtastic/util.py

@@ -584,10 +584,9 @@ def check_if_newer_version():
     pypi_version = None
     try:
         url = "https://pypi.org/pypi/meshtastic/json"
-        data = requests.get(url).json()
+        data = requests.get(url, timeout=5).json()
         pypi_version = data["info"]["version"]
-    except Exception as e:
-        # print(f"could not get version from pypi e:{e}")
+    except Exception:
         pass
     act_version = pkg_resources.get_distribution("meshtastic").version
     if pypi_version and pkg_resources.parse_version(