Mercurial Repositories > eric / file comparison
comparison: eric6/Project/DebuggerPropertiesDialog.py
eric6/Project/DebuggerPropertiesDialog.py
- changeset 7635
- 0cdead130a81
- parent 7533
- 88261c96484b
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7634:8c3d033e5044 | 7635:0cdead130a81 |
|---|---|
| 66 | 66 |
| 67 if self.project.debugProperties["VIRTUALENV"]: | 67 if self.project.debugProperties["VIRTUALENV"]: |
| 68 venvIndex = max(0, self.venvComboBox.findText( | 68 venvIndex = max(0, self.venvComboBox.findText( |
| 69 self.project.debugProperties["VIRTUALENV"])) | 69 self.project.debugProperties["VIRTUALENV"])) |
| 70 else: | 70 else: |
| 71 if self.project.pdata["PROGLANGUAGE"] == "Python2": | 71 if self.project.pdata["PROGLANGUAGE"] == "Python3": |
| 72 venvName = Preferences.getDebugger("Python2VirtualEnv") | |
| 73 elif self.project.pdata["PROGLANGUAGE"] == "Python3": | |
| 74 venvName = Preferences.getDebugger("Python3VirtualEnv") | 72 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 75 else: | 73 else: |
| 76 venvName = "" | 74 venvName = "" |
| 77 if not venvName: | 75 if not venvName: |
| 78 venvName, _ = venvManager.getDefaultEnvironment() | 76 venvName, _ = venvManager.getDefaultEnvironment() |
| 84 if self.project.debugProperties["DEBUGCLIENT"]: | 82 if self.project.debugProperties["DEBUGCLIENT"]: |
| 85 self.debugClientPicker.setText( | 83 self.debugClientPicker.setText( |
| 86 self.project.debugProperties["DEBUGCLIENT"], | 84 self.project.debugProperties["DEBUGCLIENT"], |
| 87 toNative=False) | 85 toNative=False) |
| 88 else: | 86 else: |
| 89 if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2", | 87 if self.project.pdata["PROGLANGUAGE"] == "Python3": |
| 90 "Python3"]: | |
| 91 debugClient = os.path.join( | 88 debugClient = os.path.join( |
| 92 getConfig('ericDir'), | 89 getConfig('ericDir'), |
| 93 "DebugClients", "Python", "DebugClient.py") | 90 "DebugClients", "Python", "DebugClient.py") |
| 94 else: | 91 else: |
| 95 debugClient = "" | 92 debugClient = "" |
| 143 | 140 |
| 144 self.project.debugProperties["DEBUGCLIENT"] = ( | 141 self.project.debugProperties["DEBUGCLIENT"] = ( |
| 145 self.debugClientPicker.text(toNative=False) | 142 self.debugClientPicker.text(toNative=False) |
| 146 ) | 143 ) |
| 147 if not self.project.debugProperties["DEBUGCLIENT"]: | 144 if not self.project.debugProperties["DEBUGCLIENT"]: |
| 148 if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2", | 145 if self.project.pdata["PROGLANGUAGE"] == "Python3": |
| 149 "Python3"]: | |
| 150 debugClient = os.path.join( | 146 debugClient = os.path.join( |
| 151 getConfig('ericDir'), | 147 getConfig('ericDir'), |
| 152 "DebugClients", "Python", "DebugClient.py") | 148 "DebugClients", "Python", "DebugClient.py") |
| 153 else: | 149 else: |
| 154 debugClient = "" | 150 debugClient = "" |
