Mercurial Repositories > eric / file diff

--- a/src/eric7/JediInterface/JediServer.py	Thu Dec 01 10:18:07 2022 +0100
+++ b/src/eric7/JediInterface/JediServer.py	Mon Jan 02 11:16:03 2023 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2015 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2015 - 2023 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """
@@ -14,11 +14,12 @@
 from PyQt6.QtCore import QCoreApplication, QThread, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit
 
-from eric7 import Globals, Preferences
+from eric7 import Preferences
 from eric7.EricNetwork.EricJsonServer import EricJsonServer
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.QScintilla.Editor import Editor, ReferenceItem
+from eric7.SystemUtilities import PythonUtilities
 
 from .RefactoringPreviewDialog import RefactoringPreviewDialog
 
@@ -742,7 +743,7 @@
                 None,
                 self.tr("Apply Refactoring"),
                 self.tr(
-                    "<p>The refactoring could not be applied.</p>" "<p>Reason: {0}</p>"
+                    "<p>The refactoring could not be applied.</p><p>Reason: {0}</p>"
                 ).format(result["ErrorString"]),
             )
 
@@ -814,7 +815,7 @@
             ok, exitCode = self.startClient(
                 interpreter,
                 client,
-                [Globals.getPythonLibraryDirectory()],
+                [PythonUtilities.getPythonLibraryDirectory()],
                 idString=idString,
                 environment=clientEnv,
             )