Add support for frosted, drop support for pyflakes

ColinDuquesnoy · ColinDuquesnoy · commit 910b222ef0f8 · 2014-03-17T00:18:44.000+01:00
frosted is a fork of pyflakes which is better maintained and supports
python 3.4. It is also easier to integrate in an IDE, making the
code cleaner
diff --git a/README.rst b/README.rst
@@ -25,7 +25,7 @@ Features:
   * code completion provider (using `Jedi`_)
   * code folding mode
   * auto indent mode
-  * on the fly code checkers (PyFlakes, PEP8)
+  * on the fly code checkers (frosted (fork of PyFlakes), PEP8)
   * a customisable python specific syntax highlighter
   * a pre-configured QPythonCodeEdit (with the corresponding Qt Designer plugin)
 
@@ -42,7 +42,7 @@ pyqode.python depends on the following libraries:
  - pyqode.core
  - jedi
  - pep8
- - pyflakes
+ - frosted
 
 Installation
 ------------
diff --git a/pyqode/python/editor.py b/pyqode/python/editor.py
@@ -42,7 +42,7 @@
 from pyqode.python.modes import CommentsMode
 from pyqode.python.modes import PEP8CheckerMode
 from pyqode.python.modes import PyAutoIndentMode
-from pyqode.python.modes import PyFlakesCheckerMode
+from pyqode.python.modes import FrostedCheckerMode
 from pyqode.python.modes import PyHighlighterMode
 from pyqode.python.modes import PyIndenterMode
 from pyqode.python.modes import DEFAULT_DARK_STYLES
@@ -119,7 +119,7 @@ def __init__(self, parent=None):
         self.installMode(PyHighlighterMode(self.document()))
         self.installMode(PyAutoCompleteMode())
         self.installMode(PyAutoIndentMode())
-        self.installMode(PyFlakesCheckerMode())
+        self.installMode(FrostedCheckerMode())
         self.installMode(PEP8CheckerMode())
         self.installMode(CalltipsMode())
         self.installMode(PyIndenterMode())
diff --git a/pyqode/python/modes/__init__.py b/pyqode/python/modes/__init__.py
@@ -32,7 +32,7 @@
 from pyqode.python.modes.pep8_checker import PEP8CheckerMode
 from pyqode.python.modes.autoindent import PyAutoIndentMode
 from pyqode.python.modes.indenter import PyIndenterMode
-from pyqode.python.modes.pyflakes_checker import PyFlakesCheckerMode
+from pyqode.python.modes.frosted_checker import FrostedCheckerMode
 from pyqode.python.modes.syntax_highlighter import PyHighlighterMode
 from pyqode.python.modes.syntax_highlighter import DEFAULT_DARK_STYLES
 from pyqode.python.modes.syntax_highlighter import DEFAULT_LIGHT_STYLES
@@ -41,6 +41,6 @@
 
 
 __all__ = ["PyAutoCompleteMode", "CalltipsMode", "PEP8CheckerMode",
-           "GoToAssignmentsMode", "PyAutoIndentMode", "PyFlakesCheckerMode",
+           "GoToAssignmentsMode", "PyAutoIndentMode", "FrostedCheckerMode",
            "PyIndenterMode", "CommentsMode", "PyHighlighterMode",
            "DEFAULT_DARK_STYLES", "DEFAULT_LIGHT_STYLES"]
diff --git a/pyqode/python/modes/frosted_checker.py b/pyqode/python/modes/frosted_checker.py
@@ -27,16 +27,16 @@
 This module contains the pyFlakes checker mode
 """
 from pyqode.core.modes import CheckerMode
-from pyqode.python.workers import run_pyflakes
+from pyqode.python.workers import run_frosted
 
 
-class PyFlakesCheckerMode(CheckerMode):
+class FrostedCheckerMode(CheckerMode):
     """
     This checker mode runs pyflakes on the fly to check your python syntax.
     """
-    DESCRIPTION = "Check python code using pyFlakes"
-    IDENTIFIER = "pyFlakesCheckerMode"
+    DESCRIPTION = "Check python code using frosted (pyFlakes)"
+    IDENTIFIER = "frostedCheckerMode"
 
     def __init__(self):
-        super().__init__(run_pyflakes, delay=1200,
+        super().__init__(run_frosted, delay=1200,
                          clearOnRequest=False)
diff --git a/pyqode/python/workers.py b/pyqode/python/workers.py
@@ -1,6 +1,7 @@
 """
 Contains the worker classes/functions executed on the server side.
 """
+import os
 from pyqode.core import logger
 from pyqode.core.api.constants import CheckerMessages
 from pyqode.python.code_completion import icon_from_typename
@@ -259,9 +260,10 @@ def run_pep8(request_data):
     return True, messages
 
 
-def run_pyflakes(request_data):
+def run_frosted(request_data):
     """
-    Worker that run a pyflakes code analysis on the current editor text
+    Worker that run a frosted (the fork of pyflakes) code analysis on the
+    current editor text.
     """
     import _ast
     ret_val = []
@@ -284,29 +286,17 @@ def run_pyflakes(request_data):
             # file declared was unknown.s
             logger.warning("%s: problem decoding source" % path)
         else:
-            ret_val.append((msg, CheckerMessages.WARNING, lineno))
+            ret_val.append((msg, CheckerMessages.ERROR, lineno))
     else:
         # Okay, it's syntactically valid.  Now check it.
-        from pyflakes import checker, messages
-        msg_types = {messages.UnusedImport: CheckerMessages.WARNING,
-                     messages.RedefinedWhileUnused: CheckerMessages.WARNING,
-                     messages.RedefinedInListComp: CheckerMessages.WARNING,
-                     messages.ImportShadowedByLoopVar: CheckerMessages.WARNING,
-                     messages.ImportStarUsed: CheckerMessages.WARNING,
-                     messages.UndefinedName: CheckerMessages.ERROR,
-                     messages.DoctestSyntaxError: CheckerMessages.ERROR,
-                     messages.UndefinedExport: CheckerMessages.ERROR,
-                     messages.UndefinedLocal:  CheckerMessages.ERROR,
-                     messages.DuplicateArgument: CheckerMessages.WARNING,
-                     messages.Redefined: CheckerMessages.WARNING,
-                     messages.LateFutureImport: CheckerMessages.WARNING,
-                     messages.UnusedVariable: CheckerMessages.WARNING}
-        w = checker.Checker(tree, path)
+        from frosted import checker
+        w = checker.Checker(tree, os.path.split(path)[1])
         w.messages.sort(key=lambda m: m.lineno)
         for warning in w.messages:
-            msg = warning.message % warning.message_args
+            msg = "%s: %s" % (warning.type.error_code, warning.message)
             line = warning.lineno
-            status = msg_types[type(warning)]
+            status = (CheckerMessages.WARNING
+                      if warning.type.error_code.startswith('W')
+                      else CheckerMessages.ERROR)
             ret_val.append((msg, status, line))
-    print("MESSAGES: %r" % ret_val)
     return True, ret_val
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@ def readme():
 
 
 # get requirements
-requirements = ['pyqode.core>=1.3.0', 'jedi>=0.8', 'pep8', 'pyflakes',
+requirements = ['pyqode.core>=1.3.0', 'jedi>=0.8', 'pep8', 'frosted',
                 'docutils']
 
 
