.netrc settings shouldn't blow away explicit auth settings on a session

diff --git a/requests/sessions.py b/requests/sessions.py
index 6d1000dc524a8df714b7ac2089218654b143aaf1..c24ed5aa4c34190ce7f3c6b00ae5f4b4b7ed8a31 100644 (file)
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -289,8 +289,8 @@ class Session(SessionRedirectMixin):
             for (k, v) in env_proxies.items():
                 proxies.setdefault(k, v)
 
-            # Set environment's basic authentication.
-            if not auth:
+            # Set environment's basic authentication if not explicitly set.
+            if not auth and not self.auth:
                 auth = get_netrc_auth(url)
 
             # Look for configuration.