1.1 --- a/WebStack/CGI.py Fri Aug 27 23:53:03 2004 +0000
1.2 +++ b/WebStack/CGI.py Sat Aug 28 16:51:53 2004 +0000
1.3 @@ -6,7 +6,7 @@
1.4
1.5 import Generic
1.6 import os, sys
1.7 -from Helpers.Request import MessageBodyStream
1.8 +from Helpers.Request import MessageBodyStream, get_body_fields, get_storage_items
1.9 from Helpers.Response import ConvertingStream
1.10 from Helpers.Auth import UserInfo
1.11 from Helpers import Environment
1.12 @@ -203,8 +203,7 @@
1.13 Returns a dictionary mapping field names to lists of values (even if a
1.14 single value is associated with any given field name). Each value is
1.15 either a Unicode object (representing a simple form field, for example)
1.16 - or a file-like object (representing a file upload form field, for
1.17 - example).
1.18 + or a plain string (representing a file upload form field, for example).
1.19 """
1.20
1.21 encoding = self.get_content_type().charset or encoding or "iso-8859-1"
1.22 @@ -220,13 +219,8 @@
1.23
1.24 # Traverse the storage, finding each field value.
1.25
1.26 - for field_name in self.storage_body.keys():
1.27 - fields[field_name] = []
1.28 - for field_value in self.storage_body.getlist(field_name):
1.29 - if hasattr(field_value, "file"):
1.30 - fields[field_name].append(field_value.file)
1.31 - else:
1.32 - fields[field_name].append(unicode(field_value, encoding))
1.33 + fields = get_body_fields(get_storage_items(self.storage_body), encoding)
1.34 +
1.35 return fields
1.36
1.37 def get_user(self):