1.1 --- a/WebStack/ModPython.py Wed Aug 24 21:35:54 2005 +0000
1.2 +++ b/WebStack/ModPython.py Wed Aug 24 21:45:48 2005 +0000
1.3 @@ -21,7 +21,7 @@
1.4 """
1.5
1.6 import Generic
1.7 -from Helpers.Request import get_body_field, filter_fields, Cookie
1.8 +from Helpers.Request import get_body_field, decode_value, filter_fields, Cookie
1.9 from Helpers.Response import ConvertingStream
1.10 from mod_python.util import parse_qs, FieldStorage
1.11 from mod_python import apache
1.12 @@ -186,9 +186,9 @@
1.13
1.14 query_string = self.get_query_string()
1.15 if query_string:
1.16 - return self.decode_path(self.trans.uri, encoding) + "?" + query_string
1.17 + return decode_value(self.trans.uri, encoding) + "?" + query_string
1.18 else:
1.19 - return self.decode_path(self.trans.uri, encoding)
1.20 + return decode_value(self.trans.uri, encoding)
1.21
1.22 def get_path_without_query(self, encoding=None):
1.23
1.24 @@ -202,7 +202,7 @@
1.25 character values.
1.26 """
1.27
1.28 - return self.decode_path(self.trans.uri, encoding)
1.29 + return decode_value(self.trans.uri, encoding)
1.30
1.31 def get_path_info(self, encoding=None):
1.32
1.33 @@ -217,7 +217,7 @@
1.34 character values.
1.35 """
1.36
1.37 - return self.decode_path(self.trans.path_info, encoding)
1.38 + return decode_value(self.trans.path_info, encoding)
1.39
1.40 def get_query_string(self):
1.41
1.42 @@ -244,10 +244,10 @@
1.43
1.44 fields = {}
1.45 for name, values in parse_qs(self.get_query_string(), 1).items(): # keep_blank_values=1
1.46 - name = self.decode_path(name, encoding)
1.47 + name = decode_value(name, encoding)
1.48 fields[name] = []
1.49 for value in values:
1.50 - value = self.decode_path(value, encoding)
1.51 + value = decode_value(value, encoding)
1.52 fields[name].append(value)
1.53 return fields
1.54
1.55 @@ -282,7 +282,7 @@
1.56
1.57 fields = {}
1.58 for field in self.storage_body.list:
1.59 - field_name = self.decode_path(field.name, encoding)
1.60 + field_name = decode_value(field.name, encoding)
1.61 if not fields.has_key(field_name):
1.62 fields[field_name] = []
1.63 fields[field_name].append(get_body_field(field.value, encoding))