1.1 --- a/WebStack/ModPython.py Fri Aug 26 18:08:56 2005 +0000
1.2 +++ b/WebStack/ModPython.py Fri Aug 26 18:10:52 2005 +0000
1.3 @@ -20,9 +20,10 @@
1.4 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1.5 """
1.6
1.7 -import Generic
1.8 -from Helpers.Request import get_body_field, decode_value, filter_fields, Cookie
1.9 -from Helpers.Response import ConvertingStream
1.10 +import WebStack.Generic
1.11 +from WebStack.Helpers.Request import get_body_field, decode_value, \
1.12 + filter_fields, Cookie, FileContent, parse_headers
1.13 +from WebStack.Helpers.Response import ConvertingStream
1.14 from mod_python.util import parse_qs, FieldStorage
1.15 from mod_python import apache
1.16
1.17 @@ -38,11 +39,11 @@
1.18 try:
1.19 from mod_python import Session
1.20 except ImportError:
1.21 - from Helpers.Session import SessionStore
1.22 + from WebStack.Helpers.Session import SessionStore
1.23 import os
1.24 Session = None
1.25
1.26 -class Transaction(Generic.Transaction):
1.27 +class Transaction(WebStack.Generic.Transaction):
1.28
1.29 """
1.30 mod_python transaction interface.
1.31 @@ -289,7 +290,7 @@
1.32 # Detect and store file uploads.
1.33
1.34 if field.filename:
1.35 - fields[field_name].append(field.value)
1.36 + fields[field_name].append(FileContent(field.value, parse_headers(field.headers)))
1.37 else:
1.38 fields[field_name].append(get_body_field(field.value, encoding))
1.39