diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/QScintilla/Editor.py
--- a/src/eric7/QScintilla/Editor.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/QScintilla/Editor.py Sun Dec 18 19:33:46 2022 +0100
@@ -40,7 +40,7 @@
)
from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit, QMenu
-from eric7 import Preferences, Utilities
+from eric7 import Globals, Preferences, Utilities
from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
from eric7.CodeFormatting.BlackUtilities import aboutBlack
from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
@@ -51,6 +51,7 @@
from eric7.EricWidgets import EricFileDialog, EricMessageBox
from eric7.EricWidgets.EricApplication import ericApp
from eric7.Globals import recentNameBreakpointConditions
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
from eric7.UI import PythonDisViewer
from eric7.Utilities import MouseUtilities
@@ -1858,7 +1859,9 @@
language = Preferences.getEditorLexerAssoc(bindName)
if language == "Python":
# correction for Python
- pyVer = Utilities.determinePythonVersion(filename, self.text(0), self)
+ pyVer = PythonUtilities.determinePythonVersion(
+ filename, self.text(0), self
+ )
language = "Python{0}".format(pyVer)
if language in [
"Python3",
@@ -2164,7 +2167,7 @@
@return Python version or 0 if it's not a Python file (int)
"""
- return Utilities.determinePythonVersion(self.fileName, self.text(0), self)
+ return PythonUtilities.determinePythonVersion(self.fileName, self.text(0), self)
def isPyFile(self):
"""
@@ -3416,7 +3419,7 @@
if not path and self.fileName:
path = os.path.dirname(self.fileName)
if not path:
- path = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+ path = Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir()
if self.fileName:
filterPattern = "(*{0})".format(os.path.splitext(self.fileName)[1])
@@ -6911,7 +6914,7 @@
"""
Public method to load a macro from a file.
"""
- configDir = Utilities.getConfigDir()
+ configDir = Globals.getConfigDir()
fname = EricFileDialog.getOpenFileName(
self,
self.tr("Load macro file"),
@@ -6950,7 +6953,7 @@
"""
Public method to save a macro to a file.
"""
- configDir = Utilities.getConfigDir()
+ configDir = Globals.getConfigDir()
name, ok = self.__getMacroName()
if not ok or not name:
@@ -8843,9 +8846,9 @@
elif option == "DefaultEncoding":
value = config["charset"]
elif option == "InsertFinalNewline":
- value = Utilities.toBool(config["insert_final_newline"])
+ value = Globals.toBool(config["insert_final_newline"])
elif option == "StripTrailingWhitespace":
- value = Utilities.toBool(config["trim_trailing_whitespace"])
+ value = Globals.toBool(config["trim_trailing_whitespace"])
elif option == "TabWidth":
value = int(config["tab_width"])
elif option == "IndentWidth":
