Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/CodeAssistServer.py
RefactoringRope/CodeAssistServer.py
- changeset 280
- 45f0a0511acd
- parent 273
- 803593e12756
- child 283
- d98e971d9e4c
equal
deleted
inserted
replaced
| 279:65db63c6a658 | 280:45f0a0511acd |
|---|---|
| 531 ok = idString in self.connectionNames() | 531 ok = idString in self.connectionNames() |
| 532 if not ok: | 532 if not ok: |
| 533 # client is not running | 533 # client is not running |
| 534 try: | 534 try: |
| 535 # new code using virtual environments | 535 # new code using virtual environments |
| 536 venvManager = e5App().getObject("VirtualEnvManager") | |
| 536 if idString == "Python2": | 537 if idString == "Python2": |
| 537 # Python 2 | 538 # Python 2 |
| 538 venvName = Preferences.getDebugger("Python2VirtualEnv") | 539 venvName = Preferences.getDebugger("Python2VirtualEnv") |
| 540 if not venvName and sys.version_info[0] == 2: | |
| 541 try: | |
| 542 venvName, _ = venvManager.getDefaultEnvironment() | |
| 543 except AttributeError: | |
| 544 # ignore for eric6 < 18.10 | |
| 545 pass | |
| 539 elif idString == "Python3": | 546 elif idString == "Python3": |
| 540 # Python 3 | 547 # Python 3 |
| 541 venvName = Preferences.getDebugger("Python3VirtualEnv") | 548 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 549 if not venvName and sys.version_info[0] == 3: | |
| 550 try: | |
| 551 venvName, _ = venvManager.getDefaultEnvironment() | |
| 552 except AttributeError: | |
| 553 # ignore for eric6 < 18.10 | |
| 554 pass | |
| 542 else: | 555 else: |
| 543 venvName = "" | 556 venvName = "" |
| 544 if venvName: | 557 if venvName: |
| 545 interpreter = e5App().getObject("VirtualEnvManager")\ | 558 interpreter = e5App().getObject("VirtualEnvManager")\ |
| 546 .getVirtualenvInterpreter(venvName) | 559 .getVirtualenvInterpreter(venvName) |
