Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/CodeAssistServer.py	Sat Nov 03 18:21:33 2018 +0100
+++ b/RefactoringRope/CodeAssistServer.py	Sun Nov 04 18:41:51 2018 +0100
@@ -568,6 +568,12 @@
                 interpreter = ""
                 venvName = ""
                 clientEnv = os.environ.copy()
+                if "PATH" in clientEnv:
+                    try:
+                        clientEnv["PATH"] = self.__ui.getOriginalPathString()
+                    except AttributeError:
+                        # ignore for eric6 < 18.12
+                        pass
                 try:
                     # new code using virtual environments
                     venvManager = e5App().getObject("VirtualEnvManager")
@@ -635,9 +641,15 @@
             environment variables
         @rtype tuple of (str, dict)
         """
+        projectLanguage = self.__e5project.getProjectLanguage()
         interpreter = ""
         clientEnv = os.environ.copy()
-        projectLanguage = self.__e5project.getProjectLanguage()
+        if "PATH" in clientEnv:
+            try:
+                clientEnv["PATH"] = self.__ui.getOriginalPathString()
+            except AttributeError:
+                # ignore for eric6 < 18.12
+                pass
         
         if projectLanguage.startswith("Python"):
             try: