Merge pull request pypa#3274 from xavfernandez/index_exceptions

Cleanup HTMLPage.get_page exception handling
alex · Nov 30, 2015 · 1fd381e · 1fd381e
2 parents a178a5f + d48bc5c
commit 1fd381e
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/pip/index.py b/pip/index.py
@@ -794,21 +794,20 @@ def get_page(cls, link, skip_archives=True, session=None):
 
             inst = cls(resp.content, resp.url, resp.headers)
         except requests.HTTPError as exc:
-            level = 2 if exc.response.status_code == 404 else 1
-            cls._handle_fail(link, exc, url, level=level)
+            cls._handle_fail(link, exc, url)
+        except SSLError as exc:
+            reason = ("There was a problem confirming the ssl certificate: "
+                      "%s" % exc)
+            cls._handle_fail(link, reason, url, meth=logger.info)
         except requests.ConnectionError as exc:
             cls._handle_fail(link, "connection error: %s" % exc, url)
         except requests.Timeout:
             cls._handle_fail(link, "timed out", url)
-        except SSLError as exc:
-            reason = ("There was a problem confirming the ssl certificate: "
-                      "%s" % exc)
-            cls._handle_fail(link, reason, url, level=2, meth=logger.info)
         else:
             return inst
 
     @staticmethod
-    def _handle_fail(link, reason, url, level=1, meth=None):
+    def _handle_fail(link, reason, url, meth=None):
         if meth is None:
             meth = logger.debug