Process noqa under Python2. 6_1_x

Fri, 13 Nov 2015 23:07:16 +0100

author
T.Rzepka <Tobias.Rzepka@gmail.com>
date
Fri, 13 Nov 2015 23:07:16 +0100
branch
6_1_x
changeset 4558
069c28a30ad1
parent 4557
893c9f26a178
child 4560
d9b6b9d1ba2c

Process noqa under Python2.
(grafted from 25d1fa006bf08cf65401fc7bd02f9d74ad0bc090)

Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Nov 13 22:52:26 2015 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Nov 13 23:07:16 2015 +0100
@@ -27,6 +27,11 @@
 
 from . import pep8
 
+try:
+    basestring
+except:
+    basestring = str    # define for Python3
+
 
 class CodeStyleCheckerDialog(QDialog, Ui_CodeStyleCheckerDialog):
     """
@@ -450,7 +455,7 @@
         """
         options = self.__options[:]
         flags = Utilities.extractFlags(source)
-        if "noqa" in flags and isinstance(flags["noqa"], str):
+        if "noqa" in flags and isinstance(flags["noqa"], basestring):
             excludeMessages = \
                 options[0].strip().rstrip(",")
             if excludeMessages:

eric ide

mercurial