From fe95fcd3570375b773b8d2e8c72d6f8e8527b9d6 Mon Sep 17 00:00:00 2001
From: Matthew Grossman <mgrossman@lyft.com>
Date: Tue, 8 Aug 2017 21:04:46 -0700
Subject: [PATCH] Default flake8 to --format=default

---
 ale_linters/python/flake8.vim                    |  1 +
 .../test_flake8_command_callback.vader           | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ale_linters/python/flake8.vim b/ale_linters/python/flake8.vim
index 982a098..e16090d 100644
--- a/ale_linters/python/flake8.vim
+++ b/ale_linters/python/flake8.vim
@@ -80,6 +80,7 @@ function! ale_linters#python#flake8#GetCommand(buffer, version_output) abort
     \   : ''
 
     let l:options = ale#Var(a:buffer, 'python_flake8_options')
+    \   . ' --format=default'
 
     return ale#Escape(ale_linters#python#flake8#GetExecutable(a:buffer))
     \   . (!empty(l:options) ? ' ' . l:options : '')
diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/command_callback/test_flake8_command_callback.vader
index 70527ad..e41c475 100644
--- a/test/command_callback/test_flake8_command_callback.vader
+++ b/test/command_callback/test_flake8_command_callback.vader
@@ -19,23 +19,23 @@ Execute(The flake8 callbacks should return the correct default values):
   \ '''flake8'' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ '''flake8'' --stdin-display-name %s -',
+  \ '''flake8''  --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
   " Try with older versions.
   call ale_linters#python#flake8#ClearVersionCache()
   AssertEqual
-  \ '''flake8'' -',
+  \ '''flake8''  --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(The flake8 command callback should let you set options):
   let g:ale_python_flake8_options = '--some-option'
 
   AssertEqual
-  \ '''flake8'' --some-option --stdin-display-name %s -',
+  \ '''flake8'' --some-option --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.4'])
   call ale_linters#python#flake8#ClearVersionCache()
   AssertEqual
-  \ '''flake8'' --some-option -',
+  \ '''flake8'' --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(You should be able to set a custom executable and it should be escaped):
@@ -48,7 +48,7 @@ Execute(You should be able to set a custom executable and it should be escaped):
   \ '''executable with spaces'' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ '''executable with spaces'' --stdin-display-name %s -',
+  \ '''executable with spaces''  --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
 Execute(The flake8 callbacks should detect virtualenv directories):
@@ -62,7 +62,7 @@ Execute(The flake8 callbacks should detect virtualenv directories):
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
   \   '''' . g:dir . '/python_paths/with_virtualenv/env/bin/flake8'''
-  \   . ' --stdin-display-name %s -',
+  \   . '  --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
 Execute(The FindProjectRoot should detect the project root directory for namespace package via Manifest.in):
@@ -114,7 +114,7 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ '''python'' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ '''python'' -m flake8 --some-option -',
+  \ '''python'' -m flake8 --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
   call ale_linters#python#flake8#ClearVersionCache()
@@ -129,5 +129,5 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ '''python'' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ '''python''   -m flake8 --some-option -',
+  \ '''python''   -m flake8 --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])