From f2a9312b0f53f48007129a23f6efe7f0715b903f Mon Sep 17 00:00:00 2001
From: sneakypete81 <sneakypete81@gmail.com>
Date: Sat, 7 Sep 2013 13:59:55 +0100
Subject: [PATCH] Use pylint-patcher rather than my forked version of Pylint

---
 .travis.yml            |  8 +++++---
 .travis/install_pylint | 10 ----------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100755 .travis/install_pylint

diff --git a/.travis.yml b/.travis.yml
index 0114cb0..80c2f98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ install:
   # Install test dependencies
   - pip install tox --use-mirrors
   - pip install coveralls --use-mirrors
-  - .travis/install_pylint
 
 script: tox
 
@@ -14,8 +13,11 @@ after_success:
 
 after_script:
   # Install dependencies for Pylint
-  - pip install requests requests-oauthlib --use-mirrors
+  - pip install pylint-patcher --use-mirrors
+  - pip install requests --use-mirrors
+  - pip install requests-oauthlib --use-mirrors
 
   # Run Pylint
+  # Uses pylint-patcher to allow exceptions to be stored in a patchfile
   # (for information only, any errors don't affect the Travis result)
-  - pylint --use-ignore-patch=y trovebox
+  - pylint-patcher trovebox
diff --git a/.travis/install_pylint b/.travis/install_pylint
deleted file mode 100755
index 0f5ce45..0000000
--- a/.travis/install_pylint
+++ /dev/null
@@ -1,10 +0,0 @@
-# Until the --use-ignore-patch makes it into pylint upstream, we need to
-# download and install from sneakypete81's pylint fork
-
-wget https://bitbucket.org/sneakypete81/pylint/get/use_ignore_patch.zip
-unzip use_ignore_patch.zip
-cd sneakypete81-pylint-*
-python setup.py install
-
-cd ..
-rm -r sneakypete81-pylint-*