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

Author: asvetlov

aiohttp/__init__.py

@@ -3,6 +3,7 @@
 __version__ = '0.14.0a0'
 
 
+from . import hdrs  # noqa
 from .protocol import *  # noqa
 from .connector import *  # noqa
 from .client import *  # noqa
@@ -21,4 +22,4 @@
            connector.__all__ +
            streams.__all__ +
            multidict.__all__ +
-           ['__version__'])
+           ['hdrs', '__version__'])

aiohttp/client.py

@@ -16,11 +16,10 @@
     chardet = None
 
 import aiohttp
-from . import helpers, streams
+from . import hdrs, helpers, streams
 from .log import client_logger
 from .streams import EOF_MARKER, FlowControlStreamReader
-from .multidict import (CIMultiDictProxy, MultiDictProxy,
-                        MultiDict, upstr)
+from .multidict import CIMultiDictProxy, MultiDictProxy, MultiDict
 
 HTTP_PORT = 80
 HTTPS_PORT = 443
@@ -131,7 +130,8 @@ def request(method, url, *,
                 data = None
             cookies = resp.cookies
 
-            r_url = resp.headers.get('LOCATION') or resp.headers.get('URI')
+            r_url = (resp.headers.get(hdrs.LOCATION) or
+                     resp.headers.get(hdrs.URI))
 
             scheme = urllib.parse.urlsplit(r_url)[0]
             if scheme not in ('http', 'https', ''):
@@ -156,20 +156,9 @@ class ClientRequest:
     POST_METHODS = {'PATCH', 'POST', 'PUT', 'TRACE', 'DELETE'}
     ALL_METHODS = GET_METHODS.union(POST_METHODS)
 
-    ACCEPT_ID = upstr('ACCEPT')
-    ACCEPT_ENCODING_ID = upstr('ACCEPT-ENCODING')
-    AUTHORIZATION_ID = upstr('AUTHORIZATION')
-    CONTENT_ENCODING_ID = upstr('CONTENT-ENCODING')
-    CONTENT_LENGTH_ID = upstr('CONTENT-LENGTH')
-    CONTENT_TYPE_ID = upstr('CONTENT-TYPE')
-    COOKIE_ID = upstr('COOKIE')
-    EXPECT_ID = upstr('EXPECT')
-    HOST_ID = upstr('HOST')
-    TRANSFER_ENCODING_ID = upstr('TRANSFER-ENCODING')
-
     DEFAULT_HEADERS = {
-        ACCEPT_ID: '*/*',
-        ACCEPT_ENCODING_ID: 'gzip, deflate',
+        hdrs.ACCEPT: '*/*',
+        hdrs.ACCEPT_ENCODING: 'gzip, deflate',
     }
 
     body = b''
@@ -317,19 +306,18 @@ def update_headers(self, headers):
                 self.headers[hdr] = val
 
         # add host
-        if self.HOST_ID not in self.headers:
-            self.headers[self.HOST_ID] = self.netloc
+        if hdrs.HOST not in self.headers:
+            self.headers[hdrs.HOST] = self.netloc
 
     def update_cookies(self, cookies):
         """Update request cookies header."""
         if not cookies:
             return
 
-        COOKIE_ID = self.COOKIE_ID
         c = http.cookies.SimpleCookie()
-        if COOKIE_ID in self.headers:
-            c.load(self.headers.get(COOKIE_ID, ''))
-            del self.headers[COOKIE_ID]
+        if hdrs.COOKIE in self.headers:
+            c.load(self.headers.get(hdrs.COOKIE, ''))
+            del self.headers[hdrs.COOKIE]
 
         if isinstance(cookies, dict):
             cookies = cookies.items()
@@ -341,19 +329,18 @@ def update_cookies(self, cookies):
             else:
                 c[name] = value
 
-        self.headers[COOKIE_ID] = c.output(header='', sep=';').strip()
+        self.headers[hdrs.COOKIE] = c.output(header='', sep=';').strip()
 
     def update_content_encoding(self):
         """Set request content encoding."""
-        CONTENT_ENCODING_ID = self.CONTENT_ENCODING_ID
-        enc = self.headers.get(CONTENT_ENCODING_ID, '').lower()
+        enc = self.headers.get(hdrs.CONTENT_ENCODING, '').lower()
         if enc:
             self.compress = enc
             self.chunked = True  # enable chunked, no need to deal with length
         elif self.compress:
             if not isinstance(self.compress, str):
                 self.compress = 'deflate'
-            self.headers[CONTENT_ENCODING_ID] = self.compress
+            self.headers[hdrs.CONTENT_ENCODING] = self.compress
             self.chunked = True  # enable chunked, no need to deal with length
 
     def update_auth(self, auth):
@@ -368,30 +355,29 @@ def update_auth(self, auth):
                 'BasicAuth() tuple is required instead ', DeprecationWarning)
             auth = helpers.BasicAuth(*auth)
 
-        self.headers[self.AUTHORIZATION_ID] = auth.encode()
+        self.headers[hdrs.AUTHORIZATION] = auth.encode()
 
     def update_body_from_data(self, data):
         if not data:
             return
-        CONTENT_LENGTH_ID = self.CONTENT_LENGTH_ID
-        CONTENT_TYPE_ID = self.CONTENT_TYPE_ID
 
         if isinstance(data, str):
             data = data.encode(self.encoding)
 
         if isinstance(data, (bytes, bytearray)):
             self.body = data
-            if CONTENT_TYPE_ID not in self.headers:
-                self.headers[CONTENT_TYPE_ID] = 'application/octet-stream'
-            if CONTENT_LENGTH_ID not in self.headers and not self.chunked:
-                self.headers[CONTENT_LENGTH_ID] = str(len(self.body))
+            if hdrs.CONTENT_TYPE not in self.headers:
+                self.headers[hdrs.CONTENT_TYPE] = 'application/octet-stream'
+            if hdrs.CONTENT_LENGTH not in self.headers and not self.chunked:
+                self.headers[hdrs.CONTENT_LENGTH] = str(len(self.body))
 
         elif isinstance(data, (asyncio.StreamReader, streams.DataQueue)):
             self.body = data
 
         elif asyncio.iscoroutine(data):
             self.body = data
-            if CONTENT_LENGTH_ID not in self.headers and self.chunked is None:
+            if (hdrs.CONTENT_LENGTH not in self.headers and
+                    self.chunked is None):
                 self.chunked = True
 
         elif isinstance(data, io.IOBase):
@@ -403,51 +389,51 @@ def update_body_from_data(self, data):
                 if data.mode == 'r':
                     raise ValueError('file {!r} should be open in binary mode'
                                      ''.format(data))
-            if CONTENT_TYPE_ID not in self.headers and hasattr(data, 'name'):
+            if (hdrs.CONTENT_TYPE not in self.headers and
+                    hasattr(data, 'name')):
                 mime = mimetypes.guess_type(data.name)[0]
                 mime = 'application/octet-stream' if mime is None else mime
-                self.headers[CONTENT_TYPE_ID] = mime
+                self.headers[hdrs.CONTENT_TYPE] = mime
 
         else:
             if not isinstance(data, helpers.FormData):
                 data = helpers.FormData(data)
 
             self.body = data(self.encoding)
 
-            if CONTENT_TYPE_ID not in self.headers:
-                self.headers[CONTENT_TYPE_ID] = data.content_type
+            if hdrs.CONTENT_TYPE not in self.headers:
+                self.headers[hdrs.CONTENT_TYPE] = data.content_type
 
             if data.is_multipart:
                 self.chunked = self.chunked or 8192
             else:
-                if CONTENT_LENGTH_ID not in self.headers and not self.chunked:
-                    self.headers[CONTENT_LENGTH_ID] = str(len(self.body))
+                if (hdrs.CONTENT_LENGTH not in self.headers and
+                        not self.chunked):
+                    self.headers[hdrs.CONTENT_LENGTH] = str(len(self.body))
 
     def update_transfer_encoding(self):
         """Analyze transfer-encoding header."""
-        CONTENT_LENGTH_ID = self.CONTENT_LENGTH_ID
-        TRANSFER_ENCODING_ID = self.TRANSFER_ENCODING_ID
-        te = self.headers.get(TRANSFER_ENCODING_ID, '').lower()
+        te = self.headers.get(hdrs.TRANSFER_ENCODING, '').lower()
 
         if self.chunked:
-            if CONTENT_LENGTH_ID in self.headers:
-                del self.headers[CONTENT_LENGTH_ID]
+            if hdrs.CONTENT_LENGTH in self.headers:
+                del self.headers[hdrs.CONTENT_LENGTH]
             if 'chunked' not in te:
-                self.headers[TRANSFER_ENCODING_ID] = 'chunked'
+                self.headers[hdrs.TRANSFER_ENCODING] = 'chunked'
 
             self.chunked = self.chunked if type(self.chunked) is int else 8192
         else:
             if 'chunked' in te:
                 self.chunked = 8192
             else:
                 self.chunked = None
-                if CONTENT_LENGTH_ID not in self.headers:
-                    self.headers[CONTENT_LENGTH_ID] = str(len(self.body))
+                if hdrs.CONTENT_LENGTH not in self.headers:
+                    self.headers[hdrs.CONTENT_LENGTH] = str(len(self.body))
 
     def update_expect_continue(self, expect=False):
         if expect:
-            self.headers[self.EXPECT_ID] = '100-continue'
-        elif self.headers.get(self.EXPECT_ID, '').lower() == '100-continue':
+            self.headers[hdrs.EXPECT] = '100-continue'
+        elif self.headers.get(hdrs.EXPECT, '').lower() == '100-continue':
             expect = True
 
         if expect:
@@ -580,9 +566,6 @@ def close(self):
 
 class ClientResponse:
 
-    CONTENT_TYPE_ID = upstr('CONTENT-TYPE')
-    SET_COOKIE_ID = upstr('SET-COOKIE')
-
     message = None  # RawResponseMessage object
 
     # from the Status-Line of the response
@@ -675,8 +658,8 @@ def start(self, connection, read_until_eof=False):
 
         # cookies
         self.cookies = http.cookies.SimpleCookie()
-        if self.SET_COOKIE_ID in self.headers:
-            for hdr in self.headers.getall(self.SET_COOKIE_ID):
+        if hdrs.SET_COOKIE in self.headers:
+            for hdr in self.headers.getall(hdrs.SET_COOKIE):
                 try:
                     self.cookies.load(hdr)
                 except http.cookies.CookieError as exc:
@@ -751,7 +734,7 @@ def read_and_close(self, decode=False):
         return (yield from self.read(decode))
 
     def _get_encoding(self, encoding):
-        ctype = self.headers.get(self.CONTENT_TYPE_ID, '').lower()
+        ctype = self.headers.get(hdrs.CONTENT_TYPE, '').lower()
         mtype, stype, _, params = helpers.parse_mimetype(ctype)
 
         if not encoding:
@@ -777,7 +760,7 @@ def json(self, *, encoding=None, loads=json.loads):
         if self._content is None:
             yield from self.read()
 
-        ctype = self.headers.get(self.CONTENT_TYPE_ID, '').lower()
+        ctype = self.headers.get(hdrs.CONTENT_TYPE, '').lower()
         if 'json' not in ctype:
             client_logger.warning(
                 'Attempt to decode JSON with unexpected mimetype: %s', ctype)

aiohttp/hdrs.py

@@ -0,0 +1,30 @@
+"""HTTP Headers constants."""
+from .multidict import upstr
+
+
+ACCEPT = upstr('ACCEPT')
+ACCEPT_ENCODING = upstr('ACCEPT-ENCODING')
+AUTHORIZATION = upstr('AUTHORIZATION')
+CONNECTION = upstr('CONNECTION')
+CONTENT_ENCODING = upstr('CONTENT-ENCODING')
+CONTENT_LENGTH = upstr('CONTENT-LENGTH')
+CONTENT_TYPE = upstr('CONTENT-TYPE')
+CONTENT_TRANSFER_ENCODING = upstr('CONTENT-TRANSFER-ENCODING')
+COOKIE = upstr('COOKIE')
+DATE = upstr('DATE')
+EXPECT = upstr('EXPECT')
+HOST = upstr('HOST')
+KEEP_ALIVE = upstr('KEEP-ALIVE')
+LOCATION = upstr('LOCATION')
+PROXY_AUTHENTICATE = upstr('PROXY_AUTHENTICATE')
+PROXY_AUTHORIZATION = upstr('PROXY-AUTHORIZATION')
+REFERER = upstr('REFERER')
+SET_COOKIE = upstr('SET-COOKIE')
+SEC_WEBSOCKET_KEY1 = upstr('SEC-WEBSOCKET-KEY1')
+SERVER = upstr('SERVER')
+TE = upstr('TE')
+TRAILERS = upstr('TRAILERS')
+TRANSFER_ENCODING = upstr('TRANSFER-ENCODING')
+USER_AGENT = upstr('USER-AGENT')
+URI = upstr('URI')
+UPGRADE = upstr('UPGRADE')

aiohttp/helpers.py

@@ -10,7 +10,7 @@
 from collections import namedtuple
 from wsgiref.handlers import format_date_time
 
-from . import multidict
+from . import hdrs, multidict
 
 
 class BasicAuth(namedtuple('BasicAuth', ['login', 'password', 'encoding'])):
@@ -40,9 +40,6 @@ class FormData:
     """Helper class for multipart/form-data and
     application/x-www-form-urlencoded body generation."""
 
-    CONTENT_TYPE_ID = multidict.upstr('Content-Type')
-    CONTENT_TRANSFER_ENCODING_ID = multidict.upstr('Content-Transfer-Encoding')
-
     def __init__(self, fields=()):
         self._fields = []
         self._is_multipart = False
@@ -80,11 +77,10 @@ def add_field(self, name, value, *, content_type=None, filename=None,
 
         headers = {}
         if content_type is not None:
-            headers[self.CONTENT_TYPE_ID] = content_type
+            headers[hdrs.CONTENT_TYPE] = content_type
             self._is_multipart = True
         if content_transfer_encoding is not None:
-            CTE = self.CONTENT_TRANSFER_ENCODING_ID
-            headers[CTE] = content_transfer_encoding
+            headers[hdrs.CONTENT_TRANSFER_ENCODING] = content_transfer_encoding
             self._is_multipart = True
             supported_tranfer_encoding = {
                 'base64': binascii.b2a_base64,
@@ -123,7 +119,7 @@ def add_fields(self, *fields):
     def _gen_form_urlencoded(self, encoding):
         # form data (x-www-form-urlencoded)
         data = []
-        for type_options, headers, value in self._fields:
+        for type_options, _, value in self._fields:
             data.append((type_options['name'], value))
 
         data = urllib.parse.urlencode(data, doseq=True)
@@ -275,8 +271,8 @@ def atoms(message, environ, response, transport, request_time):
         'r': r,
         's': str(getattr(response, 'status', '')),
         'b': str(getattr(response, 'output_length', '')),
-        'f': headers.get('REFERER', '-'),
-        'a': headers.get('USER-AGENT', '-'),
+        'f': headers.get(hdrs.REFERER, '-'),
+        'a': headers.get(hdrs.USER_AGENT, '-'),
         'T': str(int(request_time)),
         'D': str(request_time).split('.', 1)[-1][:5],
         'p': "<%s>" % os.getpid()