diff --git a/CHANGES.rst b/CHANGES.rst index c65a1a20e7..06e31e26ef 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -109,7 +109,7 @@ dev (master) * Fix some bugs that occur when modules incautiously patch the queue module. (Pull #1061) -* Prevent retries from occuring on read timeouts for which the request method +* Prevent retries from occurring on read timeouts for which the request method was not in the method whitelist. (Issue #1059) * Changed the PyOpenSSL contrib module to lazily load idna to avoid @@ -143,7 +143,7 @@ dev (master) non-httplib underlying FPs. (Pull #990) * Empty filenames in multipart headers are now emitted as such, rather than - being supressed. (Issue #1015) + being suppressed. (Issue #1015) * Prefer user-supplied Host headers on chunked uploads. (Issue #1009) @@ -504,7 +504,7 @@ dev (master) * All errors during a retry-enabled request should be wrapped in ``urllib3.exceptions.MaxRetryError``, including timeout-related exceptions which were previously exempt. Underlying error is accessible from the - ``.reason`` propery. (Issue #326) + ``.reason`` property. (Issue #326) * ``urllib3.exceptions.ConnectionError`` renamed to ``urllib3.exceptions.ProtocolError``. (Issue #326) diff --git a/urllib3/contrib/securetransport.py b/urllib3/contrib/securetransport.py index 2cac70f7f7..ea54c0c79b 100644 --- a/urllib3/contrib/securetransport.py +++ b/urllib3/contrib/securetransport.py @@ -88,7 +88,7 @@ SSL_WRITE_BLOCKSIZE = 16384 # This is our equivalent of util.ssl_.DEFAULT_CIPHERS, but expanded out to -# individual cipher suites. We need to do this becuase this is how +# individual cipher suites. We need to do this because this is how # SecureTransport wants them. CIPHER_SUITES = [ SecurityConst.TLS_AES_256_GCM_SHA384, diff --git a/urllib3/exceptions.py b/urllib3/exceptions.py index 6c4be58106..7bbaa9871f 100644 --- a/urllib3/exceptions.py +++ b/urllib3/exceptions.py @@ -154,7 +154,7 @@ class ResponseError(HTTPError): class SecurityWarning(HTTPWarning): - "Warned when perfoming security reducing actions" + "Warned when performing security reducing actions" pass diff --git a/urllib3/fields.py b/urllib3/fields.py index 19b0ae0c88..37fe64a3e8 100644 --- a/urllib3/fields.py +++ b/urllib3/fields.py @@ -121,7 +121,7 @@ def _render_parts(self, header_parts): 'Content-Disposition' fields. :param header_parts: - A sequence of (k, v) typles or a :class:`dict` of (k, v) to format + A sequence of (k, v) tuples or a :class:`dict` of (k, v) to format as `k1="v1"; k2="v2"; ...`. """ parts = [] diff --git a/urllib3/poolmanager.py b/urllib3/poolmanager.py index 4ae91744db..ca33674826 100644 --- a/urllib3/poolmanager.py +++ b/urllib3/poolmanager.py @@ -358,7 +358,7 @@ class ProxyManager(PoolManager): The URL of the proxy to be used. :param proxy_headers: - A dictionary contaning headers that will be sent to the proxy. In case + A dictionary containing headers that will be sent to the proxy. In case of HTTP they are being sent with each request, while in the HTTPS/CONNECT case they are sent only once. Could be used for proxy authentication. diff --git a/urllib3/request.py b/urllib3/request.py index bfd7a24548..855f25a350 100644 --- a/urllib3/request.py +++ b/urllib3/request.py @@ -117,7 +117,7 @@ def request_encode_body(self, method, url, fields=None, headers=None, } When uploading a file, providing a filename (the first parameter of the - tuple) is optional but recommended to best mimick behavior of browsers. + tuple) is optional but recommended to best mimic behavior of browsers. Note that if ``headers`` are supplied, the 'Content-Type' header will be overwritten because it depends on the dynamic random boundary string diff --git a/urllib3/util/ssl_.py b/urllib3/util/ssl_.py index f8c220c08b..42a9e98dd0 100644 --- a/urllib3/util/ssl_.py +++ b/urllib3/util/ssl_.py @@ -183,7 +183,7 @@ def resolve_cert_reqs(candidate): the wrap_socket function/method from the ssl module. Defaults to :data:`ssl.CERT_NONE`. If given a string it is assumed to be the name of the constant in the - :mod:`ssl` module or its abbrevation. + :mod:`ssl` module or its abbreviation. (So you can specify `REQUIRED` instead of `CERT_REQUIRED`. If it's neither `None` nor a string we assume it is already the numeric constant which can directly be passed to wrap_socket.