Merge branch 'master' into multidict-error

Conflicts:
	tests/test_multidict.py

Author: asvetlov

.coveragerc

@@ -3,9 +3,5 @@ branch = True
 source = aiohttp, tests
 omit = site-packages
 
-[report]
-exclude_lines =
-    @abc.
-
 [html]
 directory = coverage

.travis.yml

@@ -9,6 +9,8 @@ install:
   - pip install flake8
   - pip install docutils
   - pip install coverage
+  - pip install gunicorn
+  - pip install chardet
   - python setup.py develop
 
 script:

CHANGES.txt

@@ -37,6 +37,17 @@ CHANGES
 
 - Allow to send raw chunked encoded response.
 
+- Allow to encode output bytes stream into chunked encoding.
+
+- Allow to compress output bytes stream with `deflate` encoding.
+
+- Server has 75 seconds keepalive timeout now, was non-keepalive by default.
+
+- Application doesn't accept `**kwargs` anymore (#243).
+
+- Request is inherited from dict now for making per-request storage to
+  middlewares (#242).
+
 
 0.13.1 (12-31-2014)
 --------------------

aiohttp/_multidict.pyx

@@ -15,10 +15,8 @@ class upstr(str):
             val = str(val, encoding, errors)
         elif isinstance(val, str):
             pass
-        elif hasattr(val, '__str__'):
-            val = val.__str__()
         else:
-            val = repr(val)
+            val = str(val)
         val = val.upper()
         return str.__new__(cls, val)
 
@@ -109,53 +107,30 @@ cdef class _Base:
         body = ', '.join("'{}': {!r}".format(k, v) for k, v in self.items())
         return '<{} {{{}}}>'.format(self.__class__.__name__, body)
 
-
-
-
-
-cdef class MultiDictProxy(_Base):
-
-    def __init__(self, arg):
-        cdef MultiDict mdict
-        if not isinstance(arg, MultiDict):
-            raise TypeError(
-                'MultiDictProxy requires MultiDict instance, not {}'.format(
-                    type(arg)))
-
-        mdict = arg
-        self._items = mdict._items
-
-    def copy(self):
-        return MultiDict(self._items)
-
     def __richcmp__(self, other, op):
-        cdef MultiDictProxy typed_self = self
-        cdef MultiDictProxy typed_other
+        cdef _Base typed_self
+        cdef _Base typed_other
         cdef tuple item
         if op == 2:
-            if isinstance(other, MultiDictProxy):
-                typed_other = other
-                return typed_self._items == typed_other._items
-            elif isinstance(other, MultiDict):
+            if isinstance(self, _Base) and isinstance(other, _Base):
+                typed_self = self
                 typed_other = other
                 return typed_self._items == typed_other._items
             elif not isinstance(other, abc.Mapping):
                 return NotImplemented
-            for item in typed_self._items:
+            for item in self.items():
                 nv = other.get(item[0], _marker)
                 if item[1] != nv:
                     return False
             return True
         elif op != 2:
-            if isinstance(other, MultiDictProxy):
+            if isinstance(self, _Base) and isinstance(other, _Base):
+                typed_self = self
                 typed_other = other
                 return typed_self._items != typed_other._items
-            elif isinstance(other, MultiDict):
-                typed_other = other
-                return typed_self._items == typed_other._items
             elif not isinstance(other, abc.Mapping):
                 return NotImplemented
-            for item in typed_self._items:
+            for item in self.items():
                 nv = other.get(item[0], _marker)
                 if item[1] == nv:
                     return True
@@ -164,6 +139,21 @@ cdef class MultiDictProxy(_Base):
             return NotImplemented
 
 
+cdef class MultiDictProxy(_Base):
+
+    def __init__(self, arg):
+        cdef MultiDict mdict
+        if not isinstance(arg, MultiDict):
+            raise TypeError(
+                'MultiDictProxy requires MultiDict instance, not {}'.format(
+                    type(arg)))
+
+        mdict = arg
+        self._items = mdict._items
+
+    def copy(self):
+        return MultiDict(self._items)
+
 abc.Mapping.register(MultiDictProxy)
 
 
@@ -331,36 +321,6 @@ cdef class MultiDict(_Base):
     def update(self, *args, **kwargs):
         self._extend(args, kwargs, "update", 0)
 
-    def __richcmp__(self, other, op):
-        cdef MultiDict typed_self = self
-        cdef MultiDict typed_other
-        cdef tuple item
-        if op == 2:
-            if isinstance(other, MultiDict):
-                typed_other = other
-                return typed_self._items == typed_other._items
-            elif not isinstance(other, abc.Mapping):
-                return NotImplemented
-            for item in typed_self._items:
-                nv = other.get(item[0], _marker)
-                if item[1] != nv:
-                    return False
-            return True
-        elif op != 2:
-            if isinstance(other, MultiDict):
-                typed_other = other
-                return typed_self._items == typed_other._items
-            elif not isinstance(other, abc.Mapping):
-                return NotImplemented
-            for item in typed_self._items:
-                nv = other.get(item[0], _marker)
-                if item[1] == nv:
-                    return True
-            return False
-        else:
-            return NotImplemented
-
-
 
 abc.MutableMapping.register(MultiDict)
 

aiohttp/client.py

@@ -742,7 +742,7 @@ def _get_encoding(self, encoding):
             encoding = params.get('charset')
             if not encoding and chardet:
                 encoding = chardet.detect(self._content)['encoding']
-            if not encoding:  # pragma: no cover
+            if not encoding:
                 encoding = 'utf-8'
 
         return encoding

aiohttp/multidict.py

@@ -16,10 +16,8 @@ def __new__(cls, val='',
             val = str(val, encoding, errors)
         elif isinstance(val, str):
             pass
-        elif hasattr(val, '__str__'):
-            val = val.__str__()
         else:
-            val = repr(val)
+            val = str(val)
         val = val.upper()
         return str.__new__(cls, val)
 
@@ -79,9 +77,7 @@ def values(self):
     def __eq__(self, other):
         if not isinstance(other, abc.Mapping):
             return NotImplemented
-        if isinstance(other, _MultiDictProxy):
-            return self._items == other._items
-        elif isinstance(other, _MultiDict):
+        if isinstance(other, _Base):
             return self._items == other._items
         for k, v in self.items():
             nv = other.get(k, _marker)
@@ -206,11 +202,7 @@ def clear(self):
     # Mapping interface #
 
     def __setitem__(self, key, value):
-        try:
-            del self[key]
-        except KeyError:
-            pass
-        self._items.append((key, value))
+        self._replace(key, value)
 
     def __delitem__(self, key):
         items = self._items
@@ -333,7 +325,7 @@ def __iter__(self):
                              MultiDict,
                              CIMultiDict,
                              upstr)
-except ImportError:
+except ImportError:  # pragma: no cover
     MultiDictProxy = _MultiDictProxy
     CIMultiDictProxy = _CIMultiDictProxy
     MultiDict = _MultiDict

aiohttp/server.py

@@ -75,7 +75,7 @@ class ServerHttpProtocol(aiohttp.StreamProtocol):
     _request_parser = aiohttp.HttpRequestParser()  # default request parser
 
     def __init__(self, *, loop=None,
-                 keep_alive=None,
+                 keep_alive=75,  # NGINX default value is 75 secs
                  timeout=15,
                  tcp_keepalive=True,
                  allowed_methods=(),

aiohttp/web.py

@@ -139,7 +139,7 @@ def content_length(self, _CONTENT_LENGTH=hdrs.CONTENT_LENGTH):
 ############################################################
 
 
-class Request(HeadersMixin):
+class Request(dict, HeadersMixin):
 
     def __init__(self, app, message, payload, transport, reader, writer, *,
                  _HOST=hdrs.HOST):
@@ -1553,7 +1553,7 @@ class Application(dict):
 
     def __init__(self, *, logger=web_logger, loop=None,
                  router=None, handler_factory=RequestHandlerFactory,
-                 middlewares=(), **kwargs):
+                 middlewares=()):
         if loop is None:
             loop = asyncio.get_event_loop()
         if router is None:
@@ -1566,7 +1566,6 @@ def __init__(self, *, logger=web_logger, loop=None,
         self._loop = loop
         self.logger = logger
 
-        self.update(**kwargs)
         for factory in middlewares:
             assert asyncio.iscoroutinefunction(factory), factory
         self._middlewares = tuple(middlewares)

docs/index.rst

@@ -23,13 +23,17 @@ Library Installation
 
 ::
 
-   pip3 install aiohttp
+   pip install aiohttp
 
 For smart detection of *Content-Type* by client API you would like to
-install *chardet* also::
+install `chardet` also::
 
    pip install chardet
 
+*Optional*: To improve performances, you can install `Cython`
+ **before** `aiohttp`::
+
+   pip install cython
 
 Getting Started
 ---------------

docs/web.rst

@@ -127,6 +127,48 @@ so application developer can use classes if he wants::
    app.router.add_route('GET', '/intro', handler.handle_intro)
    app.router.add_route('GET', '/greet/{name}', handler.handle_greeting)
 
+Custom conditions for routes lookup
+-----------------------------------
+
+Sometimes you need to distinguish *web-handlers* on more complex
+criteria than *HTTP method* and *path*.
+
+While :class:`UrlDispatcher` doesn't accept extra criterias there is
+easy way to do the task by implementing the second routing layer by
+hands.
+
+The example shows custom processing based on *HTTP Accept* header::
+
+   class Handler:
+
+       def __init__(self):
+           self._accepts = {}
+
+       @asyncio.coroutine
+       def do_route(self, request):
+           acceptor = self._accepts.get(request.headers.get('ACCEPT'))
+           if acceptor is None:
+               raise HTTPNotAcceptable()
+           return (yield from acceptor(request))
+
+       def reg_acceptor(self, accept, handler):
+           self._accepts[accept] = handler
+
+
+   @asyncio.coroutine
+   def handle_json(request):
+       # do json handling
+
+   @asyncio.coroutine
+   def handle_xml(request):
+       # do xml handling
+
+   handler = Handler()
+   app.router.add_route('GET', '/', handler.do_route)
+   handler.reg_acceptor('application/json', handle_json)
+   handler.reg_acceptor('application/xml', handle_xml)
+
+
 
 .. _aiohttp-web-file-upload: