diff -r 597d7185437d -r 923d7f711cae RefactoringRope/CodeAssistServer.py
--- a/RefactoringRope/CodeAssistServer.py Thu Nov 17 18:07:34 2022 +0100
+++ b/RefactoringRope/CodeAssistServer.py Tue Dec 20 14:18:42 2022 +0100
@@ -21,6 +21,15 @@
from eric7.EricWidgets import EricMessageBox
from eric7.QScintilla.Editor import Editor
+try:
+ from eric7.SystemUtilities.PythonUtilities import (
+ getPythonLibraryDirectory,
+ getPythonExecutable,
+ )
+except ImportError:
+ # imports for eric < 23.1
+ from eric7.Globals import getPythonExecutable, getPythonLibraryDirectory
+
class CodeAssistServer(EricJsonServer):
"""
@@ -702,7 +711,7 @@
ok, exitCode = self.startClient(
interpreter,
client,
- clientArgs=[configDir, Globals.getPythonLibraryDirectory()],
+ clientArgs=[configDir, getPythonLibraryDirectory()],
idString=idString,
environment=clientEnv,
)
@@ -808,7 +817,7 @@
if venvName:
interpreter = venvManager.getVirtualenvInterpreter(venvName)
if not interpreter:
- interpreter = Globals.getPythonExecutable()
+ interpreter = getPythonExecutable()
execPath = venvManager.getVirtualenvExecPath(venvName)
# build a suitable environment
