diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/MicroPython/MicroPythonWidget.py
--- a/src/eric7/MicroPython/MicroPythonWidget.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonWidget.py Sun Dec 18 19:33:46 2022 +0100
@@ -26,7 +26,7 @@
QWidget,
)
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences
from eric7.EricGui import EricPixmapCache
from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
from eric7.EricWidgets import EricFileDialog, EricMessageBox
@@ -34,6 +34,7 @@
from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
from eric7.EricWidgets.EricProcessDialog import EricProcessDialog
from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
from eric7.UI.Info import BugAddress
from . import MicroPythonDevices, UF2FlashDialog
@@ -540,7 +541,7 @@
@param pos position to show the menu at
@type QPoint
"""
- if Globals.isMacPlatform():
+ if OSUtilities.isMacPlatform():
copyKeys = QKeySequence("Ctrl+C")
pasteKeys = QKeySequence("Ctrl+V")
selectAllKeys = QKeySequence("Ctrl+A")
@@ -758,10 +759,10 @@
elif key == Qt.Key.Key_End:
msg = b"\x1B[F"
elif (
- Globals.isMacPlatform()
+ OSUtilities.isMacPlatform()
and evt.modifiers() == Qt.KeyboardModifier.MetaModifier
) or (
- not Globals.isMacPlatform()
+ not OSUtilities.isMacPlatform()
and evt.modifiers() == Qt.KeyboardModifier.ControlModifier
):
if Qt.Key.Key_A <= key <= Qt.Key.Key_Z:
@@ -770,7 +771,7 @@
elif evt.modifiers() == (
Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.ShiftModifier
) or (
- Globals.isMacPlatform()
+ OSUtilities.isMacPlatform()
and evt.modifiers() == Qt.KeyboardModifier.ControlModifier
):
if key == Qt.Key.Key_C:
@@ -1053,7 +1054,7 @@
"""
portName = self.deviceTypeComboBox.currentData(self.DevicePortRole)
if portName:
- if Globals.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
# return it unchanged
return portName
else:
@@ -1425,7 +1426,7 @@
)
act.setEnabled(self.__connected)
self.__superMenu.addSeparator()
- if not Globals.isWindowsPlatform():
+ if not OSUtilities.isWindowsPlatform():
available = self.__mpyCrossAvailable()
act = self.__superMenu.addAction(
self.tr("Compile Python File"), self.__compileFile2Mpy
@@ -1698,10 +1699,10 @@
program = Preferences.getMicroPython("MpyCrossCompiler")
if not program:
program = "mpy-cross"
- if Utilities.isinpath(program):
+ if FileSystemUtilities.isinpath(program):
available = True
else:
- if Utilities.isExecutable(program):
+ if FileSystemUtilities.isExecutable(program):
available = True
return available
@@ -1718,7 +1719,7 @@
program = Preferences.getMicroPython("MpyCrossCompiler")
if not program:
program = "mpy-cross"
- if not Utilities.isinpath(program):
+ if not FileSystemUtilities.isinpath(program):
EricMessageBox.critical(
self,
title,
