Mercurial Repositories > eric / file diff

--- a/Project/DebuggerPropertiesDialog.py	Mon Oct 17 19:59:52 2016 +0200
+++ b/Project/DebuggerPropertiesDialog.py	Tue Oct 18 18:44:27 2016 +0200
@@ -63,18 +63,11 @@
             self.debugClientPicker.setText(
                 self.project.debugProperties["DEBUGCLIENT"])
         else:
-            if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2"]:
+            if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2",
+                                                      "Python3"]:
                 debugClient = os.path.join(
                     getConfig('ericDir'),
                     "DebugClients", "Python", "DebugClient.py")
-            elif self.project.pdata["PROGLANGUAGE"] == "Python3":
-                debugClient = os.path.join(
-                    getConfig('ericDir'),
-                    "DebugClients", "Python3", "DebugClient.py")
-            elif self.project.pdata["PROGLANGUAGE"] == "Ruby":
-                debugClient = os.path.join(
-                    getConfig('ericDir'),
-                    "DebugClients", "Ruby", "DebugClient.rb")
             else:
                 debugClient = ""
             self.debugClientPicker.setText(debugClient)
@@ -112,7 +105,8 @@
         Private slot to perform actions before the debug client selection
         dialog is shown.
         """
-        filters = self.project.dbgFilters[self.project.pdata["PROGLANGUAGE"]]
+        filters = self.project.getDebuggerFilters(
+            self.project.pdata["PROGLANGUAGE"])
         filters += self.tr("All Files (*)")
         self.debugClientPicker.setFilters(filters)
 
@@ -132,18 +126,11 @@
         self.project.debugProperties["DEBUGCLIENT"] = \
             self.debugClientPicker.text()
         if not self.project.debugProperties["DEBUGCLIENT"]:
-            if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2"]:
+            if self.project.pdata["PROGLANGUAGE"] in ["Python", "Python2",
+                                                      "Python3"]:
                 debugClient = os.path.join(
                     getConfig('ericDir'),
                     "DebugClients", "Python", "DebugClient.py")
-            elif self.project.pdata["PROGLANGUAGE"] == "Python3":
-                debugClient = os.path.join(
-                    getConfig('ericDir'),
-                    "DebugClients", "Python3", "DebugClient.py")
-            elif self.project.pdata["PROGLANGUAGE"] == "Ruby":
-                debugClient = os.path.join(
-                    getConfig('ericDir'),
-                    "DebugClients", "Ruby", "DebugClient.rb")
             else:
                 debugClient = ""
             self.project.debugProperties["DEBUGCLIENT"] = debugClient