cleanups

aiohttp/_parser.pyx

@@ -134,7 +134,11 @@ cdef class HttpParser:
             self._header_value += val
             self._raw_header_value += raw_val
 
-    cdef _on_headers_complete(self):
+    cdef _on_headers_complete(self,
+                              ENCODING='utf-8',
+                              ENCODING_ERR='surrogateescape',
+                              CONTENT_ENCODING=hdrs.CONTENT_ENCODING,
+                              SUPPORTED=('gzip', 'deflate')):
         self._process_header()
 
         method = cparser.http_method_str(<cparser.http_method> self._cparser.method)
@@ -149,14 +153,14 @@ cdef class HttpParser:
             self._upgraded = True
 
         encoding = None
-        enc = headers.get(hdrs.CONTENT_ENCODING)
+        enc = headers.get(CONTENT_ENCODING)
         if enc:
            enc = enc.lower()
-           if enc in ('gzip', 'deflate'):
+           if enc in SUPPORTED:
                 encoding = enc
 
         msg = RawRequestMessage(
-            method.decode('utf-8', 'surrogateescape'), self._path,
+            method.decode(ENCODING, ENCODING_ERR), self._path,
             self.http_version(), headers, raw_headers,
             should_close, encoding, upgrade, chunked, self._url)
 

aiohttp/_ws_impl.py

@@ -5,13 +5,12 @@
 import collections
 import hashlib
 import json
-import os
 import random
 import sys
 from enum import IntEnum
 from struct import Struct
 
-from aiohttp import errors, hdrs
+from aiohttp import errors, hdrs, helpers
 from aiohttp.log import ws_logger
 
 __all__ = ('WebSocketReader', 'WebSocketWriter', 'do_handshake',
@@ -129,7 +128,7 @@ def _websocket_mask_python(mask, data):
     return (data ^ mask).to_bytes(datalen, native_byteorder)
 
 
-if bool(os.environ.get('AIOHTTP_NO_EXTENSIONS')):
+if helpers.NO_EXTENSIONS:
     _websocket_mask = _websocket_mask_python
 else:
     try:

aiohttp/helpers.py

@@ -44,6 +44,7 @@
 
 sentinel = object()
 Timeout = timeout
+NO_EXTENSIONS = bool(os.environ.get('AIOHTTP_NO_EXTENSIONS'))
 
 
 class BasicAuth(namedtuple('BasicAuth', ['login', 'password', 'encoding'])):

aiohttp/protocol.py

@@ -706,17 +706,18 @@ def write_eof(self, chunk=b''):
 
         self.buffer_data(chunk)
 
-        yield from self.drain()
+        yield from self.drain(True)
 
         self._transport = None
         self._stream.release()
 
     @asyncio.coroutine
-    def drain(self):
+    def drain(self, last=False):
         if self._transport is not None:
             if self._buffer:
                 self._transport.write(b''.join(self._buffer))
-                self._buffer.clear()
+                if not last:
+                    self._buffer.clear()
             yield from self._stream.drain()
         else:
             if self._buffer:

aiohttp/server.py

@@ -3,7 +3,6 @@
 import asyncio
 import asyncio.streams
 import http.server
-import os
 import socket
 import traceback
 import warnings
@@ -42,7 +41,7 @@ def tcp_keepalive(server, transport):  # pragma: no cover
         pass
 
 
-if bool(os.environ.get('AIOHTTP_NO_EXTENSIONS')):
+if helpers.NO_EXTENSIONS:
     from .protocol import HttpRequestParser
 else:
     try:
@@ -238,7 +237,7 @@ def connection_lost(self, exc):
             if not handler.done():
                 handler.cancel()
 
-        self._request_handlers.clear()
+        self._request_handlers = ()
 
         if self._time_service_owner:
             self._time_service.close()