snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/rest: work around Python bug 27777

Browse source 
(See http://bugs.python.org/issue27777)
This commit is contained in:
rr- 2016-08-16 17:02:02 +02:00
parent e89a086d58
commit 0c2efc0be5
1 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
server/szurubooru/rest/app.py
View file

@ -1,5 +1,5 @@
import urllib.parse
import cgi import cgi
import io
import json import json
import re import re
from datetime import datetime from datetime import datetime
@ -19,19 +19,6 @@ def _dump_json(obj):
return json.dumps(obj, default=_json_serializer, indent=2) return json.dumps(obj, default=_json_serializer, indent=2)
def _read(env):
length = int(env.get('CONTENT_LENGTH', 0))
output = io.BytesIO()
while length > 0:
part = env['wsgi.input'].read(min(length, 1024 * 200))
if not part:
break
output.write(part)
length -= len(part)
output.seek(0)
return output
def _get_headers(env): def _get_headers(env):
headers = {} headers = {}
for key, value in env.items(): for key, value in env.items():
@ -46,29 +33,18 @@ def _create_context(env):
path = '/' + env['PATH_INFO'].lstrip('/') path = '/' + env['PATH_INFO'].lstrip('/')
headers = _get_headers(env) headers = _get_headers(env)
# obscure, claims to "avoid a bug in cgi.FieldStorage"
env.setdefault('QUERY_STRING', '')
files = {} files = {}
params = {} params = dict(urllib.parse.parse_qsl(env.get('QUERY_STRING', '')))
request_stream = _read(env) if 'multipart' in env.get('CONTENT_TYPE', ''):
form = cgi.FieldStorage(fp=request_stream, environ=env) form = cgi.FieldStorage(fp=env['wsgi.input'], environ=env)
if not form.list:
if form.list: raise errors.HttpBadRequest('No files attached.')
body = form.getvalue('metadata')
for key in form: for key in form:
if key != 'metadata': files[key] = form.getvalue(key)
if isinstance(form[key], cgi.MiniFieldStorage):
params[key] = form.getvalue(key)
else:
# _user_file_name = getattr(form[key], 'filename', None)
files[key] = form.getvalue(key)
if 'metadata' in form:
body = form.getvalue('metadata')
else:
body = request_stream.read()
else: else:
body = None body = env['wsgi.input'].read()
if body: if body:
try: try: