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

This commit is contained in:
Vikram Oberoi
2013-06-27 16:43:40 -04:00
parent 2b62980e26
commit 188e7609b3
+2 -2
View File
@@ -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.