merged upstream/master

Author: mind1m

aiohttp/connector.py

@@ -59,7 +59,7 @@ class BaseConnector(object):
     :param conn_timeout: (optional) Connect timeout.
     :param keepalive_timeout: (optional) Keep-alive timeout.
     :param bool share_cookies: Set to True to keep cookies between requests.
-    :param bool force_close: Set to True to froce close and do reconnect
+    :param bool force_close: Set to True to force close and do reconnect
         after each request (and between redirects).
     :param loop: Optional event loop.
     """
@@ -223,7 +223,7 @@ class TCPConnector(BaseConnector):
 
     :param bool verify_ssl: Set to True to check ssl certifications.
     :param bool resolve: Set to True to do DNS lookup for host name.
-    :param familiy: socket address family
+    :param family: socket address family
     :param args: see :class:`BaseConnector`
     :param kwargs: see :class:`BaseConnector`
     """

aiohttp/web.py

@@ -361,7 +361,7 @@ def post(self):
                               keep_blank_values=True,
                               encoding=content_charset)
 
-        supported_tranfer_encoding = {
+        supported_transfer_encoding = {
             'base64': binascii.a2b_base64,
             'quoted-printable': binascii.a2b_qp
         }
@@ -381,10 +381,10 @@ def post(self):
                 out.add(field.name, ff)
             else:
                 value = field.value
-                if transfer_encoding in supported_tranfer_encoding:
+                if transfer_encoding in supported_transfer_encoding:
                     # binascii accepts bytes
                     value = value.encode('utf-8')
-                    value = supported_tranfer_encoding[
+                    value = supported_transfer_encoding[
                         transfer_encoding](value)
                 out.add(field.name, value)
 
@@ -1182,7 +1182,7 @@ def __init__(self, method, handler, name, path):
         self._path = path
 
     def match(self, path):
-        # string comparsion is about 10 times faster than regexp matching
+        # string comparison is about 10 times faster than regexp matching
         if self._path == path:
             return {}
         else:

aiohttp/worker.py

@@ -1,4 +1,4 @@
-"""Async gunicorn worker for auihttp.wen.Application."""
+"""Async gunicorn worker for aiohttp.web"""
 __all__ = ['GunicornWebWorker']
 
 import asyncio

docs/client.rst

@@ -261,7 +261,7 @@ information.
 
 
 Streaming uploads
-------------------
+-----------------
 
 aiohttp support multiple types of streaming uploads, which allows you to
 send large files without reading them into memory.

docs/contributing.rst

@@ -74,7 +74,7 @@ Any extra texts (print statements and so on) should be removed.
 Tests coverage
 --------------
 
-We are stronly keeping our test coverage, please don't make it worse.
+We are strongly keeping our test coverage, please don't make it worse.
 
 Use::
 

docs/index.rst

@@ -80,7 +80,7 @@ Server example::
     loop.run_until_complete(init(loop))
     try:
         loop.run_forever()
-    except KeyboardInterrrupt:
+    except KeyboardInterrupt:
         pass
 
 
@@ -94,7 +94,7 @@ Please feel free to file an issue on `bug tracker
 or have some suggestion for library improvement.
 
 The library uses `Travis <https://travis-ci.org/KeepSafe/aiohttp>`_ for
-Continious Integration.
+Continuous Integration.
 
 
 Dependencies

docs/multidict.rst

@@ -1,4 +1,4 @@
-.. _aiohttp-multidic:
+.. _aiohttp-multidict:
 
 Multidicts
 ==========
@@ -21,7 +21,7 @@ Immutable proxies (:class:`MultiDictProxy` and
 proxied multidict, the view reflects the multidict changes. They are
 implement :class:`~collections.abc.Mapping` interface.
 
-Regular mutable (:class:`MultiDict` and :class:`CIMultiDict`) clases
+Regular mutable (:class:`MultiDict` and :class:`CIMultiDict`) classes
 implement :class:`~collections.abc.MutableMapping` and allow to change
 own content.
 
@@ -40,7 +40,7 @@ insensitive, e.g.::
 
 
 MultiDict
-----------------
+---------
 
 .. class:: MultiDict(**kwargs)
            MultiDict(mapping, **kwargs)
@@ -93,7 +93,7 @@ MultiDict
 
    .. method:: add(key, value)
 
-      Append ``(key, value)`` pair to the dictiaonary.
+      Append ``(key, value)`` pair to the dictionary.
 
    .. method:: clear()
 
@@ -173,7 +173,7 @@ MultiDict
 
    .. method:: popitem()
 
-      Remove and retun an arbitrary ``(key, value)`` pair from the dictionary.
+      Remove and return an arbitrary ``(key, value)`` pair from the dictionary.
 
       :meth:`popitem` is useful to destructively iterate over a
       dictionary, as often used in set algorithms.
@@ -217,7 +217,7 @@ CIMultiDict
    Create a case insensitive multidict instance.
 
    The behavior is the same as of :class:`MultiDict` but key
-   comparsions are case insensitive, e.g.::
+   comparisons are case insensitive, e.g.::
 
       >>> dct = CIMultiDict(a='val')
       >>> 'A' in dct
@@ -343,7 +343,7 @@ upstr
 :class:`CIMultiDict` accepts :class:`str` as *key* argument for dict
 lookups but converts it to upper case internally.
 
-For more effective processing it shoult to know if *key* is already upper cased.
+For more effective processing it should to know if *key* is already upper cased.
 
 To skip :meth:`~str.upper()` call you may create upper cased string by
 hands, e.g::

docs/server.rst

@@ -72,7 +72,7 @@ of ``GET``, ``POST``, ``PUT`` or ``DELETE`` strings.
 Handling GET params
 -------------------
 
-Currently aiohttp does not provide automatical parsing of incoming GET
+Currently aiohttp does not provide automatic parsing of incoming GET
 params.  However aiohttp does provide a nice MulitiDict wrapper for
 already parsed params.
 
@@ -119,7 +119,7 @@ GET params.
             print("Passed in POST", post_params)
 
 SSL
----------
+---
 
 To use asyncio's SSL support, just pass an SSLContext object to the
 ``create_server`` method of the loop.

docs/web.rst

@@ -266,7 +266,7 @@ data asynchronously (by ``yield from ws.send_str('data')`` for example).
 .. _aiohttp-web-exceptions:
 
 Exceptions
------------
+----------
 
 :mod:`aiohttp.web` defines exceptions for list of *HTTP status codes*.
 

docs/web_reference.rst

@@ -1,7 +1,7 @@
 .. _aiohttp-web-reference:
 
 HTTP Server Reference
-========================
+=====================
 
 .. highlight:: python
 
@@ -351,13 +351,13 @@ StreamResponse
 
    .. attribute:: chunked
 
-      Read-only property, incicates if chunked encoding is on.
+      Read-only property, indicates if chunked encoding is on.
 
       Can be enabled by :meth:`enable_chunked_encoding` call.
 
    .. method:: enable_chunked_encoding
 
-      Enables :attr:`chunked` enacoding for response. There are no ways to
+      Enables :attr:`chunked` encoding for response. There are no ways to
       disable it back. With enabled :attr:`chunked` encoding each `write()`
       operation encoded in separate chunk.
 
@@ -598,7 +598,7 @@ WebSocketResponse
 
    .. attribute:: protocol
 
-      Websocket *subprotocol* choosen after :meth:`start` call.
+      Websocket *subprotocol* chosen after :meth:`start` call.
 
       May be ``None`` if server and client protocols are
       not overlapping.
@@ -607,8 +607,8 @@ WebSocketResponse
 
       Send :const:`~aiohttp.websocket.MSG_PING` to peer.
 
-      :param message: optional payload of *ping* messasge,
-                      :class:`str` (coverted to *UTF-8* encdoded bytes)
+      :param message: optional payload of *ping* message,
+                      :class:`str` (converted to *UTF-8* encoded bytes)
                       or :class:`bytes`.
 
       :raise RuntimeError: if connections is not started or closing.
@@ -617,8 +617,8 @@ WebSocketResponse
 
       Send *unsolicited* :const:`~aiohttp.websocket.MSG_PONG` to peer.
 
-      :param message: optional payload of *pong* messasge,
-                      :class:`str` (coverted to *UTF-8* encdoded bytes)
+      :param message: optional payload of *pong* message,
+                      :class:`str` (converted to *UTF-8* encoded bytes)
                       or :class:`bytes`.
 
       :raise RuntimeError: if connections is not started or closing.
@@ -658,8 +658,8 @@ WebSocketResponse
 
       :param int code: closing code
 
-      :param message: optional payload of *pong* messasge,
-                      :class:`str` (coverted to *UTF-8* encdoded bytes)
+      :param message: optional payload of *pong* message,
+                      :class:`str` (converted to *UTF-8* encoded bytes)
                       or :class:`bytes`.
 
       :raise RuntimeError: if connection is not started or closing
@@ -668,7 +668,7 @@ WebSocketResponse
 
       A :ref:`coroutine<coroutine>` that waits for socket handshake
       finish and raises
-      :exc:`~aiohttp.errors.WebSocketDisconnectedError` at the end.
+      :exc:`~aiohttp.errors.WSClientDisconnectedError` at the end.
 
       Use the method only from write-only tasks, please call one of
       :meth:`receive_str`, :meth:`receive_bytes` or
@@ -678,7 +678,7 @@ WebSocketResponse
 
    .. method:: receive_msg()
 
-      A :ref:`coroutine<coroutine>` that waits upcomming *data*
+      A :ref:`coroutine<coroutine>` that waits upcoming *data*
       message from peer and returns it.
 
       The coroutine implicitly handles
@@ -690,14 +690,14 @@ WebSocketResponse
       It process *ping-pong game* and performs *closing handshake* internally.
 
       After websocket closing raises
-      :exc:`~aiohttp.errors.WebSocketDisconnectedError` with
+      :exc:`~aiohttp.errors.WSClientDisconnectedError` with
       connection closing data.
 
       :return: :class:`~aiohttp.websocket.Message`
 
       :raise RuntimeError: if connection is not started
 
-      :raise: :exc:`~aiohttp.errors.WebSocketDisconnectedError` on closing.
+      :raise: :exc:`~aiohttp.errors.WSClientDisconnectedError` on closing.
 
    .. method:: receive_str()
 
@@ -887,7 +887,7 @@ Router is any object that implements :class:`AbstractRouter` interface.
 
 .. class:: UrlDispatcher()
 
-   Straightforward url-mathing router, implements
+   Straightforward url-matching router, implements
    :class:`collections.abc.Mapping` for access to *named routes*.
 
    Before running :class:`Application` you should fill *route
@@ -985,7 +985,7 @@ passing it into *template engine* for example::
 
    url = app.router['route_name'].url(query={'a': 1, 'b': 2})
 
-There are three conctrete route classes:* :class:`DynamicRoute` for
+There are three concrete route classes:* :class:`DynamicRoute` for
 urls with :ref:`variable pathes<aiohttp-web-variable-handler>` spec.