innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Changed django.utils.httpwrappers.parse_file_upload() NOT to be coupled to mod_python 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-18 05:52:06 +00:00
parent f3a43a2dd4
commit ac2a7c116d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/utils/httpwrappers.py
View File

@ -40,7 +40,7 @@ class ModPythonRequest(HttpRequest):
def _load_post_and_files(self): def _load_post_and_files(self):
"Populates self._post and self._files" "Populates self._post and self._files"
if self._req.headers_in.has_key('content-type') and self._req.headers_in['content-type'].startswith('multipart'): if self._req.headers_in.has_key('content-type') and self._req.headers_in['content-type'].startswith('multipart'):
self._post, self._files = parse_file_upload(self._req) self._post, self._files = parse_file_upload(self._req.headers_in, self._req.read())
else: else:
self._post, self._files = QueryDict(self._req.read()), datastructures.MultiValueDict() self._post, self._files = QueryDict(self._req.read()), datastructures.MultiValueDict()
@ -112,12 +112,12 @@ class ModPythonRequest(HttpRequest):
META = property(_get_meta) META = property(_get_meta)
REQUEST = property(_get_request) REQUEST = property(_get_request)
def parse_file_upload(req): def parse_file_upload(header_dict, post_data):
"Returns a tuple of (POST MultiValueDict, FILES MultiValueDict), given a mod_python req object" "Returns a tuple of (POST MultiValueDict, FILES MultiValueDict)"
import email, email.Message import email, email.Message
from cgi import parse_header from cgi import parse_header
raw_message = '\r\n'.join(['%s:%s' % pair for pair in req.headers_in.items()]) raw_message = '\r\n'.join(['%s:%s' % pair for pair in header_dict.items()])
raw_message += '\r\n\r\n' + req.read() raw_message += '\r\n\r\n' + post_data
msg = email.message_from_string(raw_message) msg = email.message_from_string(raw_message)
POST = datastructures.MultiValueDict() POST = datastructures.MultiValueDict()
FILES = datastructures.MultiValueDict() FILES = datastructures.MultiValueDict()