Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the debugger interfaces setting an initial translate function. and changed the Python default extensions '.py' and '.pyw' depending on used interpreter.
Sat, 15 Nov 2014 15:57:33 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 15 Nov 2014 15:57:33 +0100
- changeset 3926
- 6492acd0a352
- parent 3924
- 3f2f828823a0
- child 3927
- 3e1dc0fb26ed
Fixed an issue in the debugger interfaces setting an initial translate function. and changed the Python default extensions '.py' and '.pyw' depending on used interpreter.
(grafted from 5afc73bf9c5750762cc57630aa17cd6e96a79144)
--- a/Debugger/DebuggerInterfacePython.py Wed Nov 12 19:02:33 2014 +0100 +++ b/Debugger/DebuggerInterfacePython.py Sat Nov 15 15:57:33 2014 +0100 @@ -74,9 +74,13 @@ self.qsock = None self.queue = [] + # set default values for capabilities of clients self.clientCapabilities = ClientDefaultCapabilities + # set translation function + self.translate = self.__identityTranslation + self.codec = QTextCodec.codecForName( Preferences.getSystem("StringEncoding"))
--- a/Debugger/DebuggerInterfacePython3.py Wed Nov 12 19:02:33 2014 +0100 +++ b/Debugger/DebuggerInterfacePython3.py Sat Nov 15 15:57:33 2014 +0100 @@ -73,9 +73,13 @@ self.qsock = None self.queue = [] + # set default values for capabilities of clients self.clientCapabilities = ClientDefaultCapabilities + # set translation function + self.translate = self.__identityTranslation + self.codec = QTextCodec.codecForName( str(Preferences.getSystem("StringEncoding")))
--- a/Debugger/DebuggerInterfaceRuby.py Wed Nov 12 19:02:33 2014 +0100 +++ b/Debugger/DebuggerInterfaceRuby.py Sat Nov 15 15:57:33 2014 +0100 @@ -70,9 +70,13 @@ self.qsock = None self.queue = [] + # set default values for capabilities of clients self.clientCapabilities = ClientDefaultCapabilities + # set translation function + self.translate = self.__identityTranslation + self.codec = QTextCodec.codecForName( str(Preferences.getSystem("StringEncoding")))
--- a/Preferences/__init__.py Wed Nov 12 19:02:33 2014 +0100 +++ b/Preferences/__init__.py Sat Nov 15 15:57:33 2014 +0100 @@ -81,10 +81,6 @@ "DebugClientType3": "standard", # supported "standard", "threaded", "custom" "DebugClient3": "", - "PythonExtensions": ".py2 .pyw2 .ptl", - # space separated list of Python extensions - "Python3Extensions": ".py .pyw .py3 .pyw3", - # space separated list of Python3 extensions "DebugEnvironmentReplace": False, "DebugEnvironment": "", "PythonRedirect": True, @@ -101,6 +97,16 @@ "AutoViewSourceCode": False, } debuggerDefaults["AllowedHosts"] = ["127.0.0.1", "::1%0"] + if sys.version_info[0] == 2: + debuggerDefaults["PythonExtensions"] = ".py .pyw .py2 .pyw2 .ptl", + # space separated list of Python extensions + debuggerDefaults["Python3Extensions"] = ".py .pyw .py3 .pyw3", + # space separated list of Python3 extensions + else: + debuggerDefaults["PythonExtensions"] = ".py2 .pyw2 .ptl", + # space separated list of Python extensions + debuggerDefaults["Python3Extensions"] = ".py .pyw .py3 .pyw3", + # space separated list of Python3 extensions # defaults for the UI settings uiDefaults = {
