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
- branch
- 5_5_x
- changeset 3925
- 5afc73bf9c57
- parent 3922
- bb7b2836a693
- child 3930
- 2968e0bfcaea
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.
--- a/Debugger/DebuggerInterfacePython.py Tue Nov 11 19:14:58 2014 +0100 +++ b/Debugger/DebuggerInterfacePython.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( Preferences.getSystem("StringEncoding"))
--- a/Debugger/DebuggerInterfacePython3.py Tue Nov 11 19:14:58 2014 +0100 +++ b/Debugger/DebuggerInterfacePython3.py Sat Nov 15 15:57:33 2014 +0100 @@ -72,9 +72,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 Tue Nov 11 19:14:58 2014 +0100 +++ b/Debugger/DebuggerInterfaceRuby.py Sat Nov 15 15:57:33 2014 +0100 @@ -69,9 +69,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 Tue Nov 11 19:14:58 2014 +0100 +++ b/Preferences/__init__.py Sat Nov 15 15:57:33 2014 +0100 @@ -80,10 +80,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, @@ -100,6 +96,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 = {
