Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "Change parsing cookies mechanism. (like Django instade of http.cookies.SimpleCookie)"

Browse Source 
This reverts commit ba1dbacd35.
This commit is contained in:
Yaser Amiri 2018-01-21 09:10:15 +03:30
parent ba1dbacd35
commit f8b1122467
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sanic/request.py
View File

@ -1,9 +1,8 @@
import sys import sys
import json import json
import socket
from cgi import parse_header from cgi import parse_header
from collections import namedtuple from collections import namedtuple
from http import cookies from http.cookies import SimpleCookie
from httptools import parse_url from httptools import parse_url
from urllib.parse import parse_qs, urlunparse from urllib.parse import parse_qs, urlunparse
@ -158,17 +157,13 @@ class Request(dict):
def cookies(self): def cookies(self):
if self._cookies is None: if self._cookies is None:
cookie = self.headers.get('Cookie') cookie = self.headers.get('Cookie')
self._cookies = {}
if cookie is not None: if cookie is not None:
for chunk in cookie.split(';'): cookies = SimpleCookie()
if '=' in chunk: cookies.load(cookie)
key, val = chunk.split('=', 1) self._cookies = {name: cookie.value
for name, cookie in cookies.items()}
else: else:
key, val = '', chunk self._cookies = {}
key, val = key.strip(), val.strip()
if key or val:
self._cookies[key] = cookies._unquote(val)
return self._cookies return self._cookies
@property @property
@ -186,22 +181,13 @@ class Request(dict):
@property @property
def socket(self): def socket(self):
if not hasattr(self, '_socket'): if not hasattr(self, '_socket'):
self._get_address() self._get_socket()
return self._socket return self._socket
def _get_address(self): def _get_address(self):
sock = self.transport.get_extra_info('socket')
if sock.family == socket.AF_INET:
self._socket = (self.transport.get_extra_info('peername') or self._socket = (self.transport.get_extra_info('peername') or
(None, None)) (None, None))
self._ip, self._port = self._socket self._ip, self._port = self._socket
elif sock.family == socket.AF_INET6:
self._socket = (self.transport.get_extra_info('peername') or
(None, None, None, None))
self._ip, self._port, *_ = self._socket
else:
self._ip, self._port = (None, None)
@property @property
def remote_addr(self): def remote_addr(self):