Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py	Sun May 31 17:26:46 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py	Sat Jul 04 11:45:34 2020 +0200
@@ -9,8 +9,6 @@
 check.
 """
 
-from __future__ import unicode_literals
-
 from PyQt5.QtCore import QObject, pyqtSignal
 
 from E5Gui.E5Application import e5App
@@ -179,9 +177,12 @@
         Public method to cancel all batch jobs.
         """
         for lang in self.getLanguages():
-            env = self.__supportedLanguages[lang][0]
-            self.backgroundService.requestCancel(
-                'batch_{0}Syntax'.format(lang), env)
+            try:
+                env = self.__supportedLanguages[lang][0]
+                self.backgroundService.requestCancel(
+                    'batch_{0}Syntax'.format(lang), env)
+            except KeyError:
+                continue
     
     def __serviceError(self, fn, msg):
         """
@@ -192,25 +193,9 @@
         """
         self.error.emit(fn, msg)
     
-    def serviceErrorPy2(self, fx, lang, fn, msg):
-        """
-        Public method handling service errors for Python 2.
-        
-        @param fx service name (string)
-        @param lang language (string)
-        @param fn file name (string)
-        @param msg message text (string)
-        """
-        if fx in ['Python2Syntax', 'batch_Python2Syntax']:
-            if fx == 'Python2Syntax':
-                self.__serviceError(fn, msg)
-            else:
-                self.__serviceError(self.tr("Python 2 batch check"), msg)
-                self.batchJobDone(fx, lang)
-    
     def serviceErrorPy3(self, fx, lang, fn, msg):
         """
-        Public method handling service errors for Python 2.
+        Public method handling service errors for Python 3.
         
         @param fx service name (string)
         @param lang language (string)
@@ -280,7 +265,6 @@
         @param lang language (string)
         """
         if fx in [
-            'Python2Syntax', 'batch_Python2Syntax',
             'Python3Syntax', 'batch_Python3Syntax',
             'JavaScriptSyntax', 'batch_JavaScriptSyntax',
             'YAMLSyntax', 'batch_YAMLSyntax',