summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-02-04 11:57:10 -0800
committerJon Dufresne <jon.dufresne@gmail.com>2018-02-05 06:23:53 -0800
commite8205c01310fcd846e081d2d8a818a0949a12125 (patch)
tree57661050f71e8a1e6afc467f8eb22883d1b36c05
parent8da118dfeb15989c47241d6ad6b7c429a34a51f3 (diff)
downloadpython-requests-e8205c01310fcd846e081d2d8a818a0949a12125.tar.gz
Trim trialing white space throughout the project
Many editors clean up trailing white space on save. By removing it all in one go, it helps keep future diffs cleaner by avoiding spurious white space changes on unrelated lines.
-rw-r--r--.travis.yml2
-rw-r--r--docs/_templates/sidebarintro.html1
-rw-r--r--docs/_templates/sidebarlogo.html1
-rw-r--r--docs/community/recommended.rst3
-rw-r--r--docs/community/updates.rst1
-rw-r--r--docs/dev/todo.rst1
-rw-r--r--docs/index.rst4
-rw-r--r--docs/user/advanced.rst10
8 files changed, 7 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index e0fbdba9..aae4b560 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,5 +27,3 @@ jobs:
- stage: coverage
python: 3.6
script: codecov
-
-
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 52c82aa5..179f043a 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -67,4 +67,3 @@
<li><a href="http://it.python-requests.org/">Italian</a></li>
<li><a href="http://es.python-requests.org/">Spanish</a></li>
</ul>
-
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index c2d824a4..2b317a28 100644
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -59,4 +59,3 @@
<li><a href="http://it.python-requests.org/">Italian</a></li>
<li><a href="http://es.python-requests.org/">Spanish</a></li>
</ul>
-
diff --git a/docs/community/recommended.rst b/docs/community/recommended.rst
index 44804919..8fcd47a4 100644
--- a/docs/community/recommended.rst
+++ b/docs/community/recommended.rst
@@ -62,6 +62,3 @@ Betamax
A VCR imitation designed only for Python-Requests.
.. _betamax: https://github.com/sigmavirus24/betamax
-
-
-
diff --git a/docs/community/updates.rst b/docs/community/updates.rst
index f755a493..3b9a3097 100644
--- a/docs/community/updates.rst
+++ b/docs/community/updates.rst
@@ -29,4 +29,3 @@ Release and Version History
===========================
.. include:: ../../HISTORY.rst
-
diff --git a/docs/dev/todo.rst b/docs/dev/todo.rst
index 707dea31..1766a28a 100644
--- a/docs/dev/todo.rst
+++ b/docs/dev/todo.rst
@@ -62,4 +62,3 @@ Google AppEngine is not officially supported although support is available
with the `Requests-Toolbelt`_.
.. _Requests-Toolbelt: https://toolbelt.readthedocs.io/
-
diff --git a/docs/index.rst b/docs/index.rst
index 72f93b90..ae5f5c7b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -30,8 +30,8 @@ consumption.
.. note:: The use of **Python 3** is *highly* preferred over Python 2. Consider upgrading your applications and infrastructure if you find yourself *still* using Python 2 in production today. If you are using Python 3, congratulations — you are indeed a person of excellent taste.
—*Kenneth Reitz*
-
-
+
+
-------------------
**Behold, the power of Requests**::
diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst
index 1bad6435..e3ed5aa9 100644
--- a/docs/user/advanced.rst
+++ b/docs/user/advanced.rst
@@ -196,18 +196,18 @@ As a result an ``SSL: CERTIFICATE_VERIFY_FAILED`` is thrown.
You can get around this behaviour by explicity merging the environment settings into your session::
from requests import Request, Session
-
+
s = Session()
req = Request('GET', url)
-
+
prepped = s.prepare_request(req)
-
+
# Merge environment settings into session
settings = s.merge_environment_settings(prepped.url, None, None, None, None)
resp = s.send(prepped, **settings)
-
+
print(resp.status_code)
-
+
.. _verification:
SSL Cert Verification