Added proxies to requests.settings

diff --git a/requests/api.py b/requests/api.py
index 8e328d2b0ff13e5d141d95fce2f64bbb76c20f66..c4690f2b53f4e9efc5db4ab0ccde0825f2da7904 100644 (file)
--- a/requests/api.py
+++ b/requests/api.py
@@ -47,7 +47,7 @@ def request(method, url,
         auth = auth or auth_manager.get_auth(url),
         timeout = timeout or config.settings.timeout,
         allow_redirects = allow_redirects,
-        proxies = proxies
+        proxies = proxies or config.settings.proxies
     )
 
     r.send()

diff --git a/requests/config.py b/requests/config.py
index 1d335f420a2193fd8a0ebef837cf9b0c08b7fe9e..1ba438fd0676838e7ed761c2fe72d1dbe8f98c3a 100644 (file)
--- a/requests/config.py
+++ b/requests/config.py
@@ -55,4 +55,5 @@ class Settings(object):
 
 settings = Settings()
 settings.base_headers = {'User-Agent': 'python-requests.org'}
-settings.accept_gzip = True
\ No newline at end of file
+settings.accept_gzip = True
+settings.proxies = None