added setting to configure MYPYPATH for MyPy linter, resolves #581

DamnWidget · Nov 10, 2016 · d6972bd · d6972bd
1 parent 07d1772
commit d6972bd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/Anaconda.sublime-settings b/Anaconda.sublime-settings
@@ -449,6 +449,11 @@
     */
     "mypy": false,
 
+    /*
+        Set the following variable to set MyPy MYPYPATH
+     */
+    "mypy_mypypath": "",
+
     /*
     	MyPy Silent Imports
 

diff --git a/anaconda_lib/linting/anaconda_mypy.py b/anaconda_lib/linting/anaconda_mypy.py
@@ -31,9 +31,10 @@ class MyPy(object):
     """MyPy class for Anaconda
     """
 
-    def __init__(self, code, filename, settings):
+    def __init__(self, code, filename, mypypath, settings):
         self.code = code
         self.filename = filename
+        self.mypypath = mypypath
         self.settings = settings
 
     @property
@@ -71,10 +72,14 @@ def check_source(self):
             sys.executable, err_ctx,
             ' '.join(self.settings[:-1]), self.filename)
         )
+        env = os.environ.copy()
+        if self.mypypath is not None and self.mypypath != "":
+            env['MYPYPATH'] = self.mypypath
+
         kwargs = {
             'cwd': os.path.dirname(os.path.abspath(__file__)),
             'bufsize': -1,
-            'env': os.environ.copy()
+            'env': env
         }
         if os.name == 'nt':
             startupinfo = subprocess.STARTUPINFO()

diff --git a/anaconda_lib/linting/sublime.py b/anaconda_lib/linting/sublime.py
@@ -333,7 +333,8 @@ def run_linter(view=None, hook=None):
         'pyflakes_explicit_ignore': get_settings(
             view, 'pyflakes_explicit_ignore', []),
         'use_mypy': get_settings(view, 'mypy', False),
-        'mypy_settings': get_mypy_settings(view)
+        'mypy_settings': get_mypy_settings(view),
+        'mypypath': get_settings(view, 'mypy_mypypath', '')
     }
 
     text = view.substr(sublime.Region(0, view.size()))

diff --git a/anaconda_server/commands/mypy.py b/anaconda_server/commands/mypy.py
@@ -12,10 +12,13 @@ class MyPy(Command):
     """Run mypy linter and return back results
     """
 
-    def __init__(self, callback, uid, vid, linter, code, filename, settings):
+    def __init__(
+            self, callback, uid, vid, linter,
+            code, filename, mypypath, settings):
         self.vid = vid
         self.code = code
         self.filename = filename
+        self.mypypath = mypypath
         self.settings = settings['mypy_settings']
         self.linter = linter
         super(MyPy, self).__init__(callback, uid)
@@ -28,7 +31,8 @@ def run(self):
             self.callback({
                 'success': True,
                 'errors': self.linter(
-                    self.code, self.filename, self.settings).execute(),
+                    self.code, self.filename, self.mypypath, self.settings
+                ).execute(),
                 'uid': self.uid,
                 'vid': self.vid,
             })

diff --git a/anaconda_server/handlers/python_lint_handler.py b/anaconda_server/handlers/python_lint_handler.py
@@ -118,7 +118,10 @@ def mypy(self, settings, code=None, filename=None):
         """
 
         lint = AnacondaMyPy
-        MyPy(self._merge, self.uid, self.vid, lint, code, filename, settings)
+        MyPy(
+            self._merge, self.uid, self.vid, lint,
+            code, filename, self.mypypath, settings
+        )
 
     def _normalize(self, settings, data):
         """Normalize pylint data before to merge
@@ -168,6 +171,9 @@ def _configure_linters(self, settings):
         if self._linters['pylint'] is True:
             self._linters['pyflakes'] = False
 
+        if self._linters['mypy']:
+            self.mypypath = settings.get('mypypath')
+
     def _merge(self, lint_result):
         """Merge the given linter results
         """