summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2014-10-05 09:05:29 +0100
committerCory Benfield <lukasaoz@gmail.com>2014-10-05 09:05:29 +0100
commit20ca9feeb33da439a963633cec08219ea8614fc5 (patch)
treed6d9ab23cab2c950e3f4b874765992aa6bc78df2
parente74791d0543aa3bb65bcdfa40c3d8946cd84a0d6 (diff)
parentb1f3a2dd66f1da05976d7f60261ce0665d4b6469 (diff)
downloadpython-requests-20ca9feeb33da439a963633cec08219ea8614fc5.tar.gz
Merge pull request #2265 from sigmavirus24/session-attrs
Remove timeout from __attrs__
-rw-r--r--requests/sessions.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/requests/sessions.py b/requests/sessions.py
index f9873064..29bd8994 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -271,9 +271,10 @@ class Session(SessionRedirectMixin):
"""
__attrs__ = [
- 'headers', 'cookies', 'auth', 'timeout', 'proxies', 'hooks',
- 'params', 'verify', 'cert', 'prefetch', 'adapters', 'stream',
- 'trust_env', 'max_redirects', 'redirect_cache']
+ 'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+ 'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
+ 'max_redirects', 'redirect_cache'
+ ]
def __init__(self):