From 43fbb6cf9a80b5dfbb927532a3c15ae2b422bd1c Mon Sep 17 00:00:00 2001
From: Angus Lees <gus@inodes.org>
Date: Mon, 25 Aug 2014 12:02:16 +1000
Subject: [PATCH] Fix incorrect exception order in _execute_request

_execute_request has a list of exception handlers to log various types
of errors with more specific error messages. Unfortunately, it catches
requests.exceptions.ConnectionError before requests.exceptions.SSLError,
but ConnectionError is a superclass of SSLError so the latter is never
invoked.

This change corrects the exception handling order, and enables the
bad-except-order pylint check now that the check passes.

Change-Id: I92bacd6088de5cbc170bc5c081a1db1baeec69e7
Closes-Bug: #1360970
---
 .pylintrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.pylintrc b/.pylintrc
index 0c90b4ad3..4611e192d 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -19,7 +19,6 @@ disable=
  locally-disabled,
 # "E" Error for important programming issues (likely bugs)
  access-member-before-definition,
- bad-except-order,
  bad-super-call,
  maybe-no-member,
  no-member,