Mercurial Repositories > eric / file diff

--- a/src/eric7/MicroPython/Devices/CircuitPythonDevices.py	Sun Jun 30 15:37:49 2024 +0200
+++ b/src/eric7/MicroPython/Devices/CircuitPythonDevices.py	Sun Jun 30 17:58:31 2024 +0200
@@ -17,7 +17,7 @@
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import QInputDialog, QMenu
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
@@ -591,7 +591,7 @@
         """
         latestUrl = reply.url().toString()
         tag = latestUrl.rsplit("/", 1)[-1]
-        latestVersion = Globals.versionToTuple(tag)
+        latestVersion = EricUtilities.versionToTuple(tag)
 
         cpyVersionStr = self.tr("unknown")
         cpyVersion = (0, 0, 0)
@@ -601,7 +601,7 @@
                 with open(bootFile, "r") as f:
                     line = f.readline()
                 cpyVersionStr = line.split(";")[0].split()[2]
-                cpyVersion = Globals.versionToTuple(cpyVersionStr)
+                cpyVersion = EricUtilities.versionToTuple(cpyVersionStr)
         if (
             cpyVersion == (0, 0, 0)
             and self._deviceData
@@ -610,7 +610,7 @@
             # drive is not mounted or 'boot_out.txt' is missing but the device
             # is connected via the serial console
             cpyVersionStr = self._deviceData["mpy_version"]
-            cpyVersion = Globals.versionToTuple(cpyVersionStr)
+            cpyVersion = EricUtilities.versionToTuple(cpyVersionStr)
 
         msg = self.tr(
             "<h4>CircuitPython Version Information</h4>"
@@ -1015,7 +1015,7 @@
 
         workspace = self.getWorkspace()
 
-        if Globals.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
+        if EricUtilities.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
             # CircuitPython >= 8.0.0: generate 'settings.toml' file
             contents = (
                 'CIRCUITPY_WIFI_SSID = "{0}"\nCIRCUITPY_WIFI_PASSWORD = "{1}"\n'
@@ -1585,7 +1585,7 @@
 
         workspace = self.getWorkspace()
 
-        if Globals.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
+        if EricUtilities.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
             # CircuitPython >= 8.0.0: generate 'settings.toml' file
             newConfig = (
                 {
@@ -1664,7 +1664,7 @@
 
         workspace = self.getWorkspace()
 
-        if Globals.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
+        if EricUtilities.versionToTuple(self._deviceData["release"]) >= (8, 0, 0):
             # CircuitPython >= 8.0.0: generate 'settings.toml' file
             newConfig = {
                 "WIZNET_IFCONFIG_0": "",