import collections
+import http.cookie
import json
import urllib.parse
'content',
'content_length',
'content_type',
- 'cookies',
+ 'cookie',
'method',
'path',
'parameters',
class Request(_Request):
def __new__(cls, env):
+ errors = []
+
accept = env.get('HTTP_ACCEPT')
accept_encoding = env.get('HTTP_ACCEPT_ENCODING')
accept_language = env.get('HTTP_ACCEPT_LANGUAGE')
content = env.get('CONTENT', '')
- content_length = env.get('CONTENT_LENGTH')
content_type = env.get('CONTENT_TYPE')
- cookies = env.get('HTTP_COOKIE')
method = env.get('REQUEST_METHOD')
path = env.get('PATH_INFO')
query = env.get('QUERY_STRING')
user_agent = env.get('HTTP_USER_AGENT')
- GET = urllib.parse.parse_qs(query)
+ content_length = env.get('CONTENT_LENGTH')
+
+ if content_length == '' or content_length is None:
+ content_length = 0
+ else:
+ try:
+ content_length = int(content_length)
+ except ValueError:
+ errors.append('Unable to parse Content-Length "{}"'.format(content_length))
+ content_length = 0
+
+ try:
+ cookie = http.cookie.SimpleCookie(env.get('HTTP_COOKIE'))
+ except:
+ cookie = http.cookie.SimpleCookie()
+
+
+ try:
+ GET = urllib.parse.parse_qs(query)
+ except:
+ GET = {}
+ errors.append('Unable to parse GET parameters from query string "{}"'.format(query))
if method == 'GET':
parameters = GET
content = content,
content_length = content_length,
content_type = content_type,
- cookies=cookies,
+ cookie=cookie,
method=method,
parameters=parameters,
path=path,
def content(self):
return (b'',)
+REQUEST_METHODS = (
+ 'GET',
+ 'HEAD',
+ 'POST',
+ 'PUT',
+ 'PATCH',
+ 'DELETE',
+ 'CONNECT',
+ 'OPTIONS',
+ 'TRACE',
+)
+
+def default_method_not_allowed_handler(request):
+ return Response('')
+
+def default_options_handler(handlers):
+ def handler(request):
+ return Response(','.join(handlers.keys()))
+ return handler
+
+def route_on_method(**kwargs):
+ handlers = {}
+ for method in REQUEST_METHODS:
+ if method in kwargs:
+ handlers[method] = kwargs.pop(method)
+
+ method_not_allowed_handler = kwargs.pop(
+ method_not_allowed,
+ default_method_not_allowed_handler,
+ )
+
+ assert len(kwargs) == 0
+
+ if 'OPTIONS' not in handlers:
+ handlers['OPTIONS'] = default_options_handler(handlers)
+
+ def handler(request):
+ return handlers.get(
+ request.method.upper(),
+ method_not_allowed_handler,
+ )(request)
+
+ return handler
+
def _get_status(response):
return {
200: '200 OK',