diff -r 65db63c6a658 -r 45f0a0511acd RefactoringRope/CodeAssistServer.py
--- a/RefactoringRope/CodeAssistServer.py Sat Aug 11 15:54:39 2018 +0200
+++ b/RefactoringRope/CodeAssistServer.py Sun Sep 16 13:13:51 2018 +0200
@@ -533,12 +533,25 @@
# client is not running
try:
# new code using virtual environments
+ venvManager = e5App().getObject("VirtualEnvManager")
if idString == "Python2":
# Python 2
venvName = Preferences.getDebugger("Python2VirtualEnv")
+ if not venvName and sys.version_info[0] == 2:
+ try:
+ venvName, _ = venvManager.getDefaultEnvironment()
+ except AttributeError:
+ # ignore for eric6 < 18.10
+ pass
elif idString == "Python3":
# Python 3
venvName = Preferences.getDebugger("Python3VirtualEnv")
+ if not venvName and sys.version_info[0] == 3:
+ try:
+ venvName, _ = venvManager.getDefaultEnvironment()
+ except AttributeError:
+ # ignore for eric6 < 18.10
+ pass
else:
venvName = ""
if venvName:
