merged upstream/master

mind1m · mind1m · commit 944524ed1d7c · 2016-07-24T13:54:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
 *.bak
 *.egg
 *.egg-info
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,13 +1,37 @@
 CHANGES
 =======
 
-0.22.2 (XX-XX-XXXX)
+0.23.0 (XX-XX-XXXX)
+-------------------
+
+- Change default size for client session's connection pool from
+  unlimited to 20 #977
+
+- Add IE support for cookie deletion. #994
+
+- Remove deprecated `WebSocketResponse.wait_closed` method (BACKWARD
+  INCOMPATIBLE)
+
+- Remove deprecated `force` parameter for `ClientResponse.close`
+  method (BACKWARD INCOMPATIBLE)
+
+- Avoid using of mutable CIMultiDict kw param in make_mocked_request
+  #997
+
+0.22.2 (07-23-2016)
 -------------------
 
 - Suppress CancelledError when Timeout raises TimeoutError #970
 
 - Don't expose `aiohttp.__version__`
 
+- Add unsafe parameter to CookieJar #968
+
+- Use unsafe cookie jar in test client tools
+
+- Expose aiohttp.CookieJar name
+
+
 0.22.1 (07-16-2016)
 -------------------
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -60,6 +60,13 @@ After that please install libraries required for development::
 We also recommend to install *ipdb* but it's on your own::
 
    $ pip install ipdb
+   
+.. note:: 
+  If you plan to use ``ipdb`` within the test suite, use::
+  
+    $ make vtest
+  
+  to run the tests. 
 
 Congratulations, you are ready to run the test suite
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -3,6 +3,7 @@ Contributors
 
 A. Jesse Jiryu Davis
 Alejandro Gómez
+Aleksey Kutepov
 Alex Khomchenko
 Alex Lisovoy
 Alex Key
@@ -65,6 +66,7 @@ Lubomir Gelo
 Ludovic Gasc
 Lukasz Marcin Dobrzanski
 Marco Paolini
+Mariano Anaya
 Martin Richard
 Mathias Fröjdman
 Matthieu Hauglustaine
@@ -111,3 +113,4 @@ Yury Selivanov
 Yusuke Tsutsumi
 Марк Коренберг
 Семён Марьясин
+Pau Freixes
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
@@ -1,6 +1,6 @@
 # This relies on each of the submodules having an __all__ variable.
 
-__version__ = '0.22.2b0'
+__version__ = '0.22.2'
 
 import multidict  # noqa
 
diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py
@@ -661,10 +661,7 @@ def start(self, connection, read_until_eof=False):
                         'Can not load response cookies: %s', exc)
         return self
 
-    def close(self, force=True):
-        if not force:
-            warnings.warn("force parameter should be True", DeprecationWarning,
-                          stacklevel=2)
+    def close(self):
         if self._closed:
             return
 
diff --git a/aiohttp/connector.py b/aiohttp/connector.py
@@ -109,14 +109,15 @@ class BaseConnector(object):
     :param keepalive_timeout: (optional) Keep-alive timeout.
     :param bool force_close: Set to True to force close and do reconnect
         after each request (and between redirects).
+    :param limit: The limit of simultaneous connections to the same endpoint.
     :param loop: Optional event loop.
     """
 
     _closed = True  # prevent AttributeError in __del__ if ctor was failed
     _source_traceback = None
 
     def __init__(self, *, conn_timeout=None, keepalive_timeout=_default,
-                 force_close=False, limit=None,
+                 force_close=False, limit=20,
                  loop=None):
 
         if force_close:
@@ -170,6 +171,12 @@ def __del__(self, _warnings=warnings):
             context['source_traceback'] = self._source_traceback
         self._loop.call_exception_handler(context)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *exc):
+        self.close()
+
     @property
     def force_close(self):
         """Ultimately close connection on releasing if True."""
@@ -182,7 +189,8 @@ def limit(self):
         Endpoints are the same if they are have equal
         (host, port, is_ssl) triple.
 
-        If limit is None the connector has no limit (default).
+        If limit is None the connector has no limit.
+        The default limit size is 20.
         """
         return self._limit
 
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -27,7 +27,7 @@
 
 
 __all__ = ('BasicAuth', 'create_future', 'FormData', 'parse_mimetype',
-           'Timeout')
+           'Timeout', 'CookieJar')
 
 
 class BasicAuth(namedtuple('BasicAuth', ['login', 'password', 'encoding'])):
@@ -587,9 +587,10 @@ class CookieJar(AbstractCookieJar):
 
     DATE_YEAR_RE = re.compile("(\d{2,4})")
 
-    def __init__(self, *, loop=None):
+    def __init__(self, *, unsafe=False, loop=None):
         super().__init__(loop=loop)
         self._host_only_cookies = set()
+        self._unsafe = unsafe
 
     def _expire_cookie(self, when, name, DAY=24*3600):
         now = self._loop.time()
@@ -608,7 +609,7 @@ def update_cookies(self, cookies, response_url=None):
         url_parsed = urlsplit(response_url or "")
         hostname = url_parsed.hostname
 
-        if is_ip_address(hostname):
+        if not self._unsafe and is_ip_address(hostname):
             # Don't accept cookies from IPs
             return
 
diff --git a/aiohttp/test_utils.py b/aiohttp/test_utils.py
@@ -349,7 +349,10 @@ def __init__(self, app, protocol="http"):
         self._server = None
         if not loop.is_running():
             loop.run_until_complete(self.start_server())
-        self._session = ClientSession(loop=self._loop)
+        self._session = ClientSession(
+            loop=self._loop,
+            cookie_jar=aiohttp.CookieJar(unsafe=True,
+                                         loop=self._loop))
         self._root = '{}://{}:{}'.format(protocol, self._address, self.port)
         self._closed = False
 
@@ -558,7 +561,7 @@ def get_extra_info(key):
 _not_set = object()
 
 
-def make_mocked_request(method, path, headers=CIMultiDict(), *,
+def make_mocked_request(method, path, headers=None, *,
                         version=HttpVersion(1, 1), closing=False,
                         app=None,
                         reader=_not_set,
@@ -613,10 +616,17 @@ def make_mocked_request(method, path, headers=CIMultiDict(), *,
 
     if version < HttpVersion(1, 1):
         closing = True
-    message = RawRequestMessage(method, path, version, headers,
-                                [(k.encode('utf-8'), v.encode('utf-8'))
-                                 for k, v in headers.items()],
-                                closing, False)
+
+    if headers:
+        hdrs = headers
+        raw_hdrs = [
+            (k.encode('utf-8'), v.encode('utf-8')) for k, v in headers.items()]
+    else:
+        hdrs = CIMultiDict()
+        raw_hdrs = []
+
+    message = RawRequestMessage(method, path, version, hdrs,
+                                raw_hdrs, closing, False)
     if app is None:
         app = _create_app_mock()
 
diff --git a/aiohttp/web_reqrep.py b/aiohttp/web_reqrep.py
@@ -511,8 +511,12 @@ def set_cookie(self, name, value, *, expires=None,
 
         self._cookies[name] = value
         c = self._cookies[name]
+
         if expires is not None:
             c['expires'] = expires
+        elif c.get('expires') == 'Thu, 01 Jan 1970 00:00:00 GMT':
+            del c['expires']
+
         if domain is not None:
             c['domain'] = domain
 
@@ -537,7 +541,9 @@ def del_cookie(self, name, *, domain=None, path='/'):
         """
         # TODO: do we need domain/path here?
         self._cookies.pop(name, None)
-        self.set_cookie(name, '', max_age=0, domain=domain, path=path)
+        self.set_cookie(name, '', max_age=0,
+                        expires="Thu, 01 Jan 1970 00:00:00 GMT",
+                        domain=domain, path=path)
 
     @property
     def content_length(self):
diff --git a/aiohttp/web_ws.py b/aiohttp/web_ws.py
@@ -154,14 +154,6 @@ def send_bytes(self, data):
                             type(data))
         self._writer.send(data, binary=True)
 
-    @asyncio.coroutine
-    def wait_closed(self):  # pragma: no cover
-        warnings.warn(
-            'wait_closed() coroutine is deprecated. use close() instead',
-            DeprecationWarning)
-
-        return (yield from self.close())
-
     @asyncio.coroutine
     def write_eof(self):
         if self._eof_sent:
diff --git a/docs/client.rst b/docs/client.rst
@@ -386,6 +386,24 @@ You also can set default headers for all session requests::
 :class:`~aiohttp.ClientSession` supports keep-alive requests
 and connection pooling out-of-the-box.
 
+.. _aiohttp-client-cookie-safety:
+
+Cookie safety
+-------------
+
+By default :class:`~aiohttp.ClientSession` uses strict version of
+:class:`~aiohttp.CookieJar`. :rfc:`2109` explicitly forbids cookie
+accepting from URLs with IP address instead of DNS name
+(e.g. `http://127.0.0.1:80/cookie`).
+
+It's good but sometimes for testing we need to enable support for such
+cookies. It should be done by passing `usafe=True` to
+:class:`~aiohttp.CookieJar` constructor::
+
+
+    jar = aiohttp.CookieJar(unsafe=True)
+    session = aiohttp.ClientSession(cookie_jar=jar)
+
 
 Connectors
 ----------
@@ -413,6 +431,13 @@ parameter to *connector*::
 
 The example limits amount of parallel connections to `30`.
 
+The default is `20`.
+
+If you explicitly want not to have limits to the same endpoint,
+pass `None`. For example::
+
+    conn = aiohttp.TCPConnector(limit=None)
+
 
 Resolving using custom nameservers
 ----------------------------------
diff --git a/docs/client_reference.rst b/docs/client_reference.rst
@@ -700,7 +700,7 @@ BaseConnector
 ^^^^^^^^^^^^^
 
 .. class:: BaseConnector(*, conn_timeout=None, keepalive_timeout=30, \
-                         limit=None, \
+                         limit=20, \
                          force_close=False, loop=None)
 
    Base class for all connectors.
@@ -730,6 +730,13 @@ BaseConnector
       recommend to use explicit loops everywhere.
       (optional)
 
+   .. versionchanged:: 0.23
+
+      ``limit`` changed from unlimited (``None``) to 20.
+      Expect a max of up to 20 connections to the same endpoint,
+      if it is not especified.
+      For limitless connections, pass `None` explicitly.
+
    .. attribute:: closed
 
       Read-only property, ``True`` if connector is closed.
diff --git a/docs/testing.rst b/docs/testing.rst
@@ -185,10 +185,11 @@ functionality, the AioHTTPTestCase is provided::
 Faking request object
 ---------------------
 
-aiohttp provides test utility for creating fake `web.Request` objects:
-:data:`aiohttp.test_utils.make_mocked_request`, it could be useful in case of
-simple unit tests, like handler tests, or simulate error conditions that
-hard to reproduce on real server. ::
+aiohttp provides test utility for creating fake
+:class:`aiohttp.web.Request` objects:
+:func:`aiohttp.test_utils.make_mocked_request`, it could be useful in
+case of simple unit tests, like handler tests, or simulate error
+conditions that hard to reproduce on real server::
 
     from aiohttp import web
 
@@ -201,6 +202,18 @@ hard to reproduce on real server. ::
         resp = header(req)
         assert resp.body == b'data'
 
+.. warning::
+
+   We don't recommed to apply
+   :func:`~aiohttp.test_utils.make_mocked_request` everywhere for
+   testing web-handler's business object -- please use test client and
+   real networking via 'localhost' as shown in examples before.
+
+   :func:`~aiohttp.test_utils.make_mocked_request` exists only for
+   testing complex cases (e.g. emulating network errors) which
+   are extremely hard or even impossible to test by conventional
+   way.
+
 
 aiohttp.test_utils
 ------------------
diff --git a/docs/web_reference.rst b/docs/web_reference.rst
@@ -504,6 +504,11 @@ StreamResponse
 
       :param str path: optional cookie path, ``'/'`` by default
 
+      .. versionchanged:: 0.23
+
+         Fixed cookie expiration support for
+         Internet Explorer (version less than 11).
+
    .. attribute:: content_length
 
       *Content-Length* for outgoing response.
diff --git a/examples/basic_srv.py b/examples/basic_srv.py
@@ -6,7 +6,7 @@
 
 import asyncio
 from urllib.parse import urlparse, parse_qsl
-from aiohttp.multidict import MultiDict
+from aiohttp import MultiDict
 
 
 class HttpRequestHandler(aiohttp.server.ServerHttpProtocol):
diff --git a/tests/test_client_response.py b/tests/test_client_response.py
@@ -269,12 +269,6 @@ def test_get_encoding_unknown(self, m_chardet):
         self.response.headers = {'CONTENT-TYPE': 'application/json'}
         self.assertEqual(self.response._get_encoding(), 'utf-8')
 
-    def test_close_deprecated(self):
-        self.response._connection = self.connection
-        with self.assertWarns(DeprecationWarning):
-            self.response.close(force=False)
-        self.assertIsNone(self.response._connection)
-
     def test_raise_for_status_2xx(self):
         self.response.status = 200
         self.response.reason = 'OK'
diff --git a/tests/test_connector.py b/tests/test_connector.py
@@ -682,9 +682,13 @@ def test_limit_property(self):
 
     def test_limit_property_default(self):
         conn = aiohttp.BaseConnector(loop=self.loop)
-        self.assertIsNone(conn.limit)
+        self.assertEquals(conn.limit, 20)
         conn.close()
 
+    def test_limitless(self):
+        with aiohttp.BaseConnector(loop=self.loop, limit=None) as conn:
+            self.assertIsNone(conn.limit)
+
     def test_force_close_and_explicit_keep_alive(self):
         with self.assertRaises(ValueError):
             aiohttp.BaseConnector(loop=self.loop, keepalive_timeout=30,
diff --git a/tests/test_proxy.py b/tests/test_proxy.py
diff --git a/tests/test_web_functional.py b/tests/test_web_functional.py
diff --git a/tests/test_web_request.py b/tests/test_web_request.py
diff --git a/tests/test_web_response.py b/tests/test_web_response.py
diff --git a/tests/test_web_websocket_functional_oldstyle.py b/tests/test_web_websocket_functional_oldstyle.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+*.swp`
`1`	`2`	`*.bak`
`2`	`3`	`*.egg`
`3`	`4`	`*.egg-info`