From 8ee5e03fce46af0ce8b511fe61d8a20090625973 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Tue, 19 Jul 2016 11:15:45 -0700
Subject: [PATCH] Removing catching-non-exception from pylint disable.

This is because the false positive was fixed in Pylint
1.6.4.
---
 scripts/pylintrc_default | 2 --
 tox.ini                  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default
index c732205a85a9..df64b2784a50 100644
--- a/scripts/pylintrc_default
+++ b/scripts/pylintrc_default
@@ -92,7 +92,6 @@ load-plugins=pylint.extensions.check_docs
 #                      will be detected by our 100% code coverage.
 #
 # New opinions in pylint 1.6, enforcing PEP 257.  #1968 for eventual fixes
-# - catching-non-exception
 # - missing-raises-doc
 disable =
     maybe-no-member,
@@ -103,7 +102,6 @@ disable =
     redefined-variable-type,
     wrong-import-position,
     no-name-in-module,
-    catching-non-exception,
     missing-raises-doc,
 
 
diff --git a/tox.ini b/tox.ini
index 9ce84c03873a..a7c525cb9d78 100644
--- a/tox.ini
+++ b/tox.ini
@@ -133,7 +133,7 @@ commands =
     python {toxinidir}/scripts/run_pylint.py
 deps =
     pep8
-    pylint >= 1.6.3
+    pylint >= 1.6.4
     unittest2
     psutil
     Sphinx