Merge branch 'master' of github.com:KeepSafe/aiohttp

Author: asvetlov

CHANGES.txt

@@ -39,4 +39,4 @@ CHANGES
 
 - Close connection on websocket hadshake error #703
 
-- Implement calss based views #684
+- Implement class based views #684

aiohttp/helpers.py

@@ -208,34 +208,6 @@ def guess_filename(obj, default=None):
     return default
 
 
-def parse_remote_addr(forward):
-    if isinstance(forward, str):
-        # we only took the last one
-        # http://en.wikipedia.org/wiki/X-Forwarded-For
-        if ',' in forward:
-            forward = forward.rsplit(',', 1)[-1].strip()
-
-        # find host and port on ipv6 address
-        if '[' in forward and ']' in forward:
-            host = forward.split(']')[0][1:].lower()
-        elif ':' in forward and forward.count(':') == 1:
-            host = forward.split(':')[0].lower()
-        else:
-            host = forward
-
-        forward = forward.split(']')[-1]
-        if ':' in forward and forward.count(':') == 1:
-            port = forward.split(':', 1)[1]
-        else:
-            port = 80
-
-        remote = (host, port)
-    else:
-        remote = forward
-
-    return remote[0], str(remote[1])
-
-
 class AccessLogger:
     """Helper object to log access.
 

aiohttp/websocket.py

@@ -188,11 +188,12 @@ def _websocket_mask_python(mask, data):
     version when available.
 
     """
-    assert len(mask) == 4
+    assert isinstance(data, bytearray), data
+    assert len(mask) == 4, mask
     datalen = len(data)
     if datalen == 0:
         # everything work without this, but may be changed later in Python.
-        return b''
+        return bytearray()
     data = int.from_bytes(data, native_byteorder)
     mask = int.from_bytes(mask * (datalen // 4) + mask[: datalen % 4],
                           native_byteorder)

docs/web.rst

@@ -44,9 +44,9 @@ After that, create a server and run the *asyncio loop* as usual::
    except KeyboardInterrupt:
        pass
    finally:
-       loop.run_until_complete(handler.finish_connections(1.0))
        srv.close()
        loop.run_until_complete(srv.wait_closed())
+       loop.run_until_complete(handler.finish_connections(1.0))
        loop.run_until_complete(app.finish())
    loop.close()
 
@@ -188,6 +188,33 @@ application developers can organize handlers in classes if they so wish::
    app.router.add_route('GET', '/greet/{name}', handler.handle_greeting)
 
 
+Class Based Views
+^^^^^^^^^^^^^^^^^
+
+:mod:`aiohttp.web` has support for django-style class based views.
+
+You can derive from :class:`View` and define methods for handling http
+requests::
+
+   class MyView(web.View):
+       async def get(self):
+           return await get_resp(self.request)
+
+       async def post(self):
+           return await post_resp(self.request)
+
+Handlers should be coroutines accepting self only and returning
+response object as regular :term:`web-handler`. Request object can be
+retrieved by :attr:`View.request` property.
+
+After implementing the view (``MyView`` from example above) should be
+registered in application's router::
+
+   app.router.add_route('*', '/path/to', MyView)
+
+Example will process GET and POST requests for */path/to* but raise
+*405 Method not allowed* exception for unimplemented HTTP methods.
+
 Route Views
 ^^^^^^^^^^^
 

tests/post_data.txt

@@ -459,3 +459,38 @@ def parse_frame(buf, cont=False):
     assert res, (Message(websocket.OPCODE_CLOSE, 0, ''), 0)
     res = out._buffer[1]
     assert res == (Message(websocket.OPCODE_TEXT, 'line1line2', ''), 10)
+
+
+websocket_mask_data = bytearray(
+    b'some very long data for masking by websocket')
+websocket_mask_mask = b'1234'
+websocket_mask_masked = (b'B]^Q\x11DVFH\x12_[_U\x13PPFR\x14W]A\x14\\S@_X'
+                         b'\\T\x14SK\x13CTP@[RYV@')
+
+
+def test_websocket_mask_python():
+    ret = websocket._websocket_mask_python(websocket_mask_mask,
+                                           websocket_mask_data)
+    assert ret == websocket_mask_masked
+
+
+@pytest.mark.skipif(not hasattr(websocket, '_websocket_mask_cython'),
+                    reason='Requires Cython')
+def test_websocket_mask_cython():
+    ret = websocket._websocket_mask_cython(websocket_mask_mask,
+                                           websocket_mask_data)
+    assert ret == websocket_mask_masked
+
+
+def test_websocket_mask_python_empty():
+    ret = websocket._websocket_mask_python(websocket_mask_mask,
+                                           bytearray())
+    assert ret == bytearray()
+
+
+@pytest.mark.skipif(not hasattr(websocket, '_websocket_mask_cython'),
+                    reason='Requires Cython')
+def test_websocket_mask_cython_empty():
+    ret = websocket._websocket_mask_cython(websocket_mask_mask,
+                                           bytearray())
+    assert ret == bytearray()