Fix python-mode#600

klen · klen · commit fd70ac2ab74a · 2015-09-16T18:02:44.000+03:00
diff --git a/pymode/libs/pylama/__init__.py b/pymode/libs/pylama/__init__.py
@@ -5,7 +5,7 @@
 :license: BSD, see LICENSE for more details.
 """
 
-__version__ = "7.0.5"
+__version__ = "7.0.6"
 __project__ = "pylama"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"
diff --git a/pymode/libs/pylama/lint/extensions.py b/pymode/libs/pylama/lint/extensions.py
@@ -26,13 +26,14 @@
 except ImportError:
     pass
 
-try:
-    from pkg_resources import iter_entry_points
 
-    for entry in iter_entry_points('pylama.linter'):
-        if entry.name not in LINTERS:
+from pkg_resources import iter_entry_points
+
+for entry in iter_entry_points('pylama.linter'):
+    if entry.name not in LINTERS:
+        try:
             LINTERS[entry.name] = entry.load()()
-except ImportError:
-    pass
+        except ImportError:
+            pass
 
 #  pylama:ignore=E0611
diff --git a/pymode/lint.py b/pymode/lint.py
@@ -7,9 +7,12 @@
 
 
 from pylama.lint.extensions import LINTERS
-from pylama.lint.pylama_pylint import Linter
 
-LINTERS['pylint'] = Linter()
+try:
+    from pylama.lint.pylama_pylint import Linter
+    LINTERS['pylint'] = Linter()
+except Exception: # noqa
+    pass
 
 
 def code_check():
