Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
jwilk committed Dec 1, 2015
1 parent 6cfe6e7 commit 23d9b07
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dev (XXXX)
- The ``json`` parameter to ``post()`` and friends will now only be used if
neither ``data`` nor ``files`` are present, consistent with the
documentation.
- We now ignore empty fields in the ``NO_PROXY`` enviroment variable.
- We now ignore empty fields in the ``NO_PROXY`` environment variable.
- Fixed problem where ``httplib.BadStatusLine`` would get raised if combining
``stream=True`` with ``contextlib.closing``.
- Prevented bugs where we would attempt to return the same connection back to
Expand Down Expand Up @@ -533,7 +533,7 @@ This is not a backwards compatible change.
- Improved mime-compatible JSON handling
- Proxy fixes
- Path hack fixes
- Case-Insensistive Content-Encoding headers
- Case-Insensitive Content-Encoding headers
- Support for CJK parameters in form posts


Expand Down Expand Up @@ -620,7 +620,7 @@ This is not a backwards compatible change.
+++++++++++++++++++

- Removal of Requests.async in favor of `grequests <https://github.com/kennethreitz/grequests>`_
- Allow disabling of cookie persistiance.
- Allow disabling of cookie persistence.
- New implementation of safe_mode
- cookies.get now supports default argument
- Session cookies not saved when Session.request is called with return_response=False
Expand Down
2 changes: 1 addition & 1 deletion requests/cookies.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def _copy_cookie_jar(jar):
return None

if hasattr(jar, 'copy'):
# We're dealing with an instane of RequestsCookieJar
# We're dealing with an instance of RequestsCookieJar
return jar.copy()
# We're dealing with a generic CookieJar instance
new_jar = copy.copy(jar)
Expand Down
4 changes: 2 additions & 2 deletions requests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def prepare_method(self, method):
def prepare_url(self, url, params):
"""Prepares the given HTTP URL."""
#: Accept objects that have string representations.
#: We're unable to blindy call unicode/str functions
#: We're unable to blindly call unicode/str functions
#: as this will include the bytestring indicator (b'')
#: on python 3.x.
#: https://github.com/kennethreitz/requests/pull/2238
Expand Down Expand Up @@ -631,7 +631,7 @@ def is_redirect(self):

@property
def is_permanent_redirect(self):
"""True if this Response one of the permanant versions of redirect"""
"""True if this Response one of the permanent versions of redirect"""
return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))

@property
Expand Down
4 changes: 2 additions & 2 deletions requests/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def __init__(self):
#: 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

Expand Down Expand Up @@ -634,7 +634,7 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
'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):
Expand Down
2 changes: 1 addition & 1 deletion test_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ def test_session_hooks_are_used_with_no_request_hooks(self, httpbin):
assert prep.hooks['response'] != []
assert prep.hooks['response'] == [hook]

def test_session_hooks_are_overriden_by_request_hooks(self, httpbin):
def test_session_hooks_are_overridden_by_request_hooks(self, httpbin):
hook1 = lambda x, *args, **kwargs: x
hook2 = lambda x, *args, **kwargs: x
assert hook1 is not hook2
Expand Down

0 comments on commit 23d9b07

Please sign in to comment.