aboutsummaryrefslogtreecommitdiff
path: root/requests/sessions.py
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2015-12-22 13:47:07 +0000
committerChristopher Baines <mail@cbaines.net>2015-12-22 13:48:06 +0000
commit79f51e45f74dd32f9c1a103150ded9d575f5f94c (patch)
treeadcea8da78181c97b46d4483657877b2b348833a /requests/sessions.py
parent59759b30c8a8f23377afe562a44ddc893dbbb833 (diff)
parent08c16e06ad11c6fcb26f4ca1ea3f11093598092f (diff)
downloadpython-requests-79f51e45f74dd32f9c1a103150ded9d575f5f94c.tar
python-requests-79f51e45f74dd32f9c1a103150ded9d575f5f94c.tar.gz
change version to 2.9.1-1 (UNRELEASED)
New upstream release 2.9.1
Diffstat (limited to 'requests/sessions.py')
-rw-r--r--requests/sessions.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/requests/sessions.py b/requests/sessions.py
index ad63902..9eaa36a 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -273,13 +273,13 @@ class Session(SessionRedirectMixin):
>>> import requests
>>> s = requests.Session()
>>> s.get('http://httpbin.org/get')
- 200
+ <Response [200]>
Or as a context manager::
>>> with requests.Session() as s:
>>> s.get('http://httpbin.org/get')
- 200
+ <Response [200]>
"""
__attrs__ = [
@@ -325,7 +325,7 @@ class Session(SessionRedirectMixin):
#: limit, a :class:`TooManyRedirects` exception is raised.
self.max_redirects = DEFAULT_REDIRECT_LIMIT
- #: Trust environement settings for proxy configuration, default
+ #: Trust environment settings for proxy configuration, default
#: authentication and similar.
self.trust_env = True
@@ -433,8 +433,8 @@ class Session(SessionRedirectMixin):
hostname to the URL of the proxy.
:param stream: (optional) whether to immediately download the response
content. Defaults to ``False``.
- :param verify: (optional) if ``True``, the SSL cert will be verified.
- A CA_BUNDLE path can also be provided.
+ :param verify: (optional) whether the SSL cert will be verified.
+ A CA_BUNDLE path can also be provided. Defaults to ``True``.
:param cert: (optional) if String, path to ssl client cert file (.pem).
If Tuple, ('cert', 'key') pair.
"""
@@ -634,7 +634,7 @@ class Session(SessionRedirectMixin):
'cert': cert}
def get_adapter(self, url):
- """Returns the appropriate connnection adapter for the given URL."""
+ """Returns the appropriate connection adapter for the given URL."""
for (prefix, adapter) in self.adapters.items():
if url.lower().startswith(prefix):