using "Python -m" to launch linters #716, #923, #1059

Author: DonJayamanne

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Version 0.6.8 (xxxx)
 # Add new editor menu 'Run Current Unit Test File' [#1061](https://github.com/DonJayamanne/pythonVSCode/issues/1061)
+# Changed 'mypy-lang' to mypy [#930](https://github.com/DonJayamanne/pythonVSCode/issues/930), [#998](https://github.com/DonJayamanne/pythonVSCode/issues/998)
 
 ### Version 0.6.7 (02 July 2017)
 * Updated icon from jpg to png (transparent background)

src/client/common/installer.ts

@@ -34,10 +34,9 @@ ProductInstallScripts.set(Product.pylint, ['-m', 'pip', 'install', 'pylint']);
 ProductInstallScripts.set(Product.pytest, ['-m', 'pip', 'install', '-U', 'pytest']);
 ProductInstallScripts.set(Product.yapf, ['-m', 'pip', 'install', 'yapf']);
 
-const ProductExecutableAndArgs = new Map<Product, {executable: string, args: string[]}>();
+export const ProductExecutableAndArgs = new Map<Product, {executable: string, args: string[]}>();
 ProductExecutableAndArgs.set(Product.mypy, {executable: 'python', args:['-m', 'mypy']});
 ProductExecutableAndArgs.set(Product.nosetest, {executable: 'python', args:['-m', 'nose']});
-ProductExecutableAndArgs.set(Product.pep8, {executable: 'python', args:['-m', 'pep8']});
 ProductExecutableAndArgs.set(Product.pylama, {executable: 'python', args:['-m', 'pylama']});
 ProductExecutableAndArgs.set(Product.prospector, {executable: 'python', args:['-m', 'prospector']});
 ProductExecutableAndArgs.set(Product.pylint, {executable: 'python', args:['-m', 'pylint']});

src/client/linters/flake8.ts

@@ -2,7 +2,7 @@
 
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 export class Linter extends baseLinter.BaseLinter {
@@ -22,6 +22,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let flake8Path = this.pythonSettings.linting.flake8Path;
         let flake8Args = Array.isArray(this.pythonSettings.linting.flake8Args) ? this.pythonSettings.linting.flake8Args : [];
+        
+        if (flake8Args.length === 0 && ProductExecutableAndArgs.has(Product.flake8)){
+            flake8Path = ProductExecutableAndArgs.get(Product.flake8).executable;
+            flake8Args = ProductExecutableAndArgs.get(Product.flake8).args;
+        }
+        
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(flake8Path, flake8Args.concat(['--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {

src/client/linters/mypy.ts

@@ -2,7 +2,7 @@
 
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 const REGEX = '(?<file>.py):(?<line>\\d+): (?<type>\\w+): (?<message>.*)\\r?(\\n|$)';
@@ -22,6 +22,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let mypyPath = this.pythonSettings.linting.mypyPath;
         let mypyArgs = Array.isArray(this.pythonSettings.linting.mypyArgs) ? this.pythonSettings.linting.mypyArgs : [];
+        
+        if (mypyArgs.length === 0 && ProductExecutableAndArgs.has(Product.mypy)){
+            mypyPath = ProductExecutableAndArgs.get(Product.mypy).executable;
+            mypyArgs = ProductExecutableAndArgs.get(Product.mypy).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(mypyPath, mypyArgs.concat([document.uri.fsPath]), document, this.workspaceRootPath, cancellation, REGEX).then(messages => {
                 messages.forEach(msg => {

src/client/linters/pep8Linter.ts

@@ -2,7 +2,7 @@
 
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 export class Linter extends baseLinter.BaseLinter {
@@ -22,6 +22,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pep8Path = this.pythonSettings.linting.pep8Path;
         let pep8Args = Array.isArray(this.pythonSettings.linting.pep8Args) ? this.pythonSettings.linting.pep8Args : [];
+        
+        if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8)){
+            pep8Path = ProductExecutableAndArgs.get(Product.pep8).executable;
+            pep8Args = ProductExecutableAndArgs.get(Product.pep8).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>(resolve => {
             this.run(pep8Path, pep8Args.concat(['--format=%(row)d,%(col)d,%(code).1s,%(code)s:%(text)s', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {

src/client/linters/prospector.ts

@@ -3,7 +3,7 @@
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
 import { execPythonFile } from './../common/utils';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 interface IProspectorResponse {
@@ -39,6 +39,12 @@ export class Linter extends baseLinter.BaseLinter {
         let prospectorPath = this.pythonSettings.linting.prospectorPath;
         let outputChannel = this.outputChannel;
         let prospectorArgs = Array.isArray(this.pythonSettings.linting.prospectorArgs) ? this.pythonSettings.linting.prospectorArgs : [];
+        
+        if (prospectorArgs.length === 0 && ProductExecutableAndArgs.has(Product.prospector)){
+            prospectorPath = ProductExecutableAndArgs.get(Product.prospector).executable;
+            prospectorArgs = ProductExecutableAndArgs.get(Product.prospector).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             execPythonFile(prospectorPath, prospectorArgs.concat(['--absolute-paths', '--output-format=json', document.uri.fsPath]), this.workspaceRootPath, false, null, cancellation).then(data => {
                 let parsedData: IProspectorResponse;

src/client/linters/pydocstyle.ts

@@ -5,7 +5,7 @@ import * as baseLinter from './baseLinter';
 import { ILintMessage } from './baseLinter';
 import { OutputChannel } from 'vscode';
 import { execPythonFile, IS_WINDOWS } from './../common/utils';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 export class Linter extends baseLinter.BaseLinter {
@@ -23,6 +23,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pydocstylePath = this.pythonSettings.linting.pydocstylePath;
         let pydocstyleArgs = Array.isArray(this.pythonSettings.linting.pydocstyleArgs) ? this.pythonSettings.linting.pydocstyleArgs : [];
+        
+        if (pydocstyleArgs.length === 0 && ProductExecutableAndArgs.has(Product.pydocstyle)){
+            pydocstylePath = ProductExecutableAndArgs.get(Product.pydocstyle).executable;
+            pydocstyleArgs = ProductExecutableAndArgs.get(Product.pydocstyle).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>(resolve => {
             this.run(pydocstylePath, pydocstyleArgs.concat([document.uri.fsPath]), document, null, cancellation).then(messages => {
                 // All messages in pep8 are treated as warnings for now

src/client/linters/pylama.ts

@@ -2,7 +2,7 @@
 
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 const REGEX = '(?<file>.py):(?<line>\\d+):(?<column>\\d+): \\[(?<type>\\w+)\\] (?<code>\\w\\d+):? (?<message>.*)\\r?(\\n|$)';
@@ -24,6 +24,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pylamaPath = this.pythonSettings.linting.pylamaPath;
         let pylamaArgs = Array.isArray(this.pythonSettings.linting.pylamaArgs) ? this.pythonSettings.linting.pylamaArgs : [];
+        
+        if (pylamaArgs.length === 0 && ProductExecutableAndArgs.has(Product.pylama)){
+            pylamaPath = ProductExecutableAndArgs.get(Product.pylama).executable;
+            pylamaArgs = ProductExecutableAndArgs.get(Product.pylama).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>(resolve => {
             this.run(pylamaPath, pylamaArgs.concat(['--format=parsable', document.uri.fsPath]), document, this.workspaceRootPath, cancellation, REGEX).then(messages => {
                 // All messages in pylama are treated as warnings for now

src/client/linters/pylint.ts

@@ -2,7 +2,7 @@
 
 import * as baseLinter from './baseLinter';
 import { OutputChannel } from 'vscode';
-import { Product } from '../common/installer';
+import { Product, ProductExecutableAndArgs } from '../common/installer';
 import { TextDocument, CancellationToken } from 'vscode';
 
 export class Linter extends baseLinter.BaseLinter {
@@ -20,6 +20,12 @@ export class Linter extends baseLinter.BaseLinter {
 
         let pylintPath = this.pythonSettings.linting.pylintPath;
         let pylintArgs = Array.isArray(this.pythonSettings.linting.pylintArgs) ? this.pythonSettings.linting.pylintArgs : [];
+        
+        if (pep8Args.length === 0 && ProductExecutableAndArgs.has(Product.pep8)){
+            pep8Path = ProductExecutableAndArgs.get(Product.pep8).executable;
+            pep8Args = ProductExecutableAndArgs.get(Product.pep8).args;
+        }
+
         return new Promise<baseLinter.ILintMessage[]>((resolve, reject) => {
             this.run(pylintPath, pylintArgs.concat(['--msg-template=\'{line},{column},{category},{msg_id}:{msg}\'', '--reports=n', '--output-format=text', document.uri.fsPath]), document, this.workspaceRootPath, cancellation).then(messages => {
                 messages.forEach(msg => {