From a560e094279c755b7a9bd5f3d29c303155ed8b27 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Mon, 29 Jun 2015 10:56:51 +0900
Subject: [PATCH 1/2] Allow get_netrc_auth to raise parse/permission errors to
 caller

If the netrc file exists but cannot be parsed or read, get_netrc_auth
silently fails.

Add a new argument `ignore_errors` which when set to False will cause
any parse/permission errors to be raised to the caller.  The default
value is True, which means the default behavior is unchanged.

Fixes #2654

Change-Id: I7436aaaf593178673ab84fd9e7ab4bcb0e3fe75e
---
 requests/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/requests/utils.py b/requests/utils.py
index 8fba62dd..db841a36 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -67,7 +67,7 @@ def super_len(o):
         return len(o.getvalue())
 
 
-def get_netrc_auth(url):
+def get_netrc_auth(url, ignore_errors=True):
     """Returns the Requests tuple auth for a given url from netrc."""
 
     try:
@@ -106,7 +106,8 @@ def get_netrc_auth(url):
         except (NetrcParseError, IOError):
             # If there was a parsing error or a permissions issue reading the file,
             # we'll just skip netrc auth
-            pass
+            if not ignore_errors:
+                raise
 
     # AppEngine hackiness.
     except (ImportError, AttributeError):

From 884cb7a7fbaea704427ed878dfbdeae3744c9e71 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Mon, 29 Jun 2015 12:22:57 +0900
Subject: [PATCH 2/2] Change ignore_errors to raise_errors in get_netrc_auth

Change-Id: Ib82c7c614edafc15e5db858d9c1b9a73aebd8a95
---
 requests/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requests/utils.py b/requests/utils.py
index db841a36..3fd0e41f 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -67,7 +67,7 @@ def super_len(o):
         return len(o.getvalue())
 
 
-def get_netrc_auth(url, ignore_errors=True):
+def get_netrc_auth(url, raise_errors=False):
     """Returns the Requests tuple auth for a given url from netrc."""
 
     try:
@@ -105,8 +105,8 @@ def get_netrc_auth(url, ignore_errors=True):
                 return (_netrc[login_i], _netrc[2])
         except (NetrcParseError, IOError):
             # If there was a parsing error or a permissions issue reading the file,
-            # we'll just skip netrc auth
-            if not ignore_errors:
+            # we'll just skip netrc auth unless explicitly asked to raise errors.
+            if raise_errors:
                 raise
 
     # AppEngine hackiness.