From 5dc891f207ed253489265b89aa38ee04519feefc Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 30 Nov 2015 20:17:27 +0100
Subject: [PATCH] pylint: Move expected-line-ending-format to config.

---
 .pylintrc | 1 +
 tox.ini   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 815ee470d..b02c75ce6 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -49,6 +49,7 @@ docstring-min-length=3
 [FORMAT]
 max-line-length=79
 ignore-long-lines=<?https?://
+expected-line-ending-format=LF
 
 [SIMILARITIES]
 min-similarity-lines=8
diff --git a/tox.ini b/tox.ini
index 82397371f..091f8929d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -110,8 +110,8 @@ deps =
     requests==2.8.1
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no --expected-line-ending-format=LF
-    {envpython} scripts/dev/run_pylint_on_tests.py --output-format=colorized --reports=no --expected-line-ending-format=LF
+    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no
+    {envpython} scripts/dev/run_pylint_on_tests.py --output-format=colorized --reports=no
 
 [testenv:pylint-tip]
 basepython = python3
@@ -125,8 +125,8 @@ deps =
     hg+https://bitbucket.org/logilab/pylint
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no --expected-line-ending-format=LF
-    {envpython} scripts/dev/run_pylint_on_tests.py --output-format=colorized --reports=no --expected-line-ending-format=LF
+    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no
+    {envpython} scripts/dev/run_pylint_on_tests.py --output-format=colorized --reports=no
 
 [testenv:pep257]
 basepython = python3