Wed, 01 Jan 2014 22:59:10 +0100
Bugfixes for Linux and if not both interpreters are specified. Project file updated.
Utilities/BackgroundService.py | file | annotate | diff | comparison | revisions | |
eric5.e4p | file | annotate | diff | comparison | revisions |
--- a/Utilities/BackgroundService.py Tue Dec 31 18:03:31 2013 +0100 +++ b/Utilities/BackgroundService.py Wed Jan 01 22:59:10 2014 +0100 @@ -58,11 +58,16 @@ port = self.serverPort() ## NOTE: Need the port if started external in debugger: print('BackgroundService listening on: %i' % port) + if sys.platform == 'win32': + pyCompare = Utilities.samefilepath + else: + pyCompare = Utilities.samepath + for pyIdx, pyName in enumerate(['Python', 'Python3']): interpreter = Preferences.getDebugger( pyName + "Interpreter") - if Utilities.samefilepath(interpreter, sys.executable): + if pyCompare(interpreter, sys.executable): process = self.__startInternalClient(port) else: process = self.__startExternalClient(interpreter, port) @@ -151,7 +156,8 @@ fx, fn, [ True, fn, 0, 0, '', 'No connection to Python{0} interpreter. ' - 'Check your debugger settings.'.format(int(isPy3) + 2)]) + 'Check your debugger settings.'.format(int(isPy3) + 2), + []]) else: header = struct.pack( b'!II', len(packedData), adler32(packedData) & 0xffffffff)
--- a/eric5.e4p Tue Dec 31 18:03:31 2013 +0100 +++ b/eric5.e4p Wed Jan 01 22:59:10 2014 +0100 @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!-- eric5 project file for project eric5 --> +<!-- Saved: 2014-01-01, 22:56:51 --> +<!-- Copyright (C) 2014 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <ProjectWordList>Dictionaries/words.dic</ProjectWordList> @@ -1111,6 +1113,15 @@ <Source>UtilitiesPython2/pep8.py</Source> <Source>UtilitiesPython2/__init__.py</Source> <Source>UtilitiesPython2/Tools.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/py3flakes/checker.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/py3flakes/messages.py</Source> + <Source>Utilities/BackgroundClient.py</Source> + <Source>Utilities/BackgroundService.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/pyflakes/checker.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py</Source> + <Source>Plugins/CheckerPlugins/SyntaxChecker/py3flakes/__init__.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form>