Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/CodeAssistServer.py
RefactoringRope/CodeAssistServer.py
- changeset 287
- 09afe26b734c
- parent 285
- 247d62c682dc
- child 291
- da88cb84ae30
equal
deleted
inserted
replaced
| 286:6289f63f5d33 | 287:09afe26b734c |
|---|---|
| 566 interpreter, clientEnv = self.__interpreterForProject() | 566 interpreter, clientEnv = self.__interpreterForProject() |
| 567 else: | 567 else: |
| 568 interpreter = "" | 568 interpreter = "" |
| 569 venvName = "" | 569 venvName = "" |
| 570 clientEnv = os.environ.copy() | 570 clientEnv = os.environ.copy() |
| 571 if "PATH" in clientEnv: | |
| 572 try: | |
| 573 clientEnv["PATH"] = self.__ui.getOriginalPathString() | |
| 574 except AttributeError: | |
| 575 # ignore for eric6 < 18.12 | |
| 576 pass | |
| 571 try: | 577 try: |
| 572 # new code using virtual environments | 578 # new code using virtual environments |
| 573 venvManager = e5App().getObject("VirtualEnvManager") | 579 venvManager = e5App().getObject("VirtualEnvManager") |
| 574 if idString == "Python2": | 580 if idString == "Python2": |
| 575 # Python 2 | 581 # Python 2 |
| 633 | 639 |
| 634 @return tuple containing the interpreter of the current project and the | 640 @return tuple containing the interpreter of the current project and the |
| 635 environment variables | 641 environment variables |
| 636 @rtype tuple of (str, dict) | 642 @rtype tuple of (str, dict) |
| 637 """ | 643 """ |
| 644 projectLanguage = self.__e5project.getProjectLanguage() | |
| 638 interpreter = "" | 645 interpreter = "" |
| 639 clientEnv = os.environ.copy() | 646 clientEnv = os.environ.copy() |
| 640 projectLanguage = self.__e5project.getProjectLanguage() | 647 if "PATH" in clientEnv: |
| 648 try: | |
| 649 clientEnv["PATH"] = self.__ui.getOriginalPathString() | |
| 650 except AttributeError: | |
| 651 # ignore for eric6 < 18.12 | |
| 652 pass | |
| 641 | 653 |
| 642 if projectLanguage.startswith("Python"): | 654 if projectLanguage.startswith("Python"): |
| 643 try: | 655 try: |
| 644 # new code using virtual environments | 656 # new code using virtual environments |
| 645 venvManager = e5App().getObject("VirtualEnvManager") | 657 venvManager = e5App().getObject("VirtualEnvManager") |
