WebStack/Zope.py | raw changeset files shortlog |
1.1 --- a/WebStack/Zope.py Mon Aug 30 18:24:17 2004 +0000 1.2 +++ b/WebStack/Zope.py Tue Aug 31 18:28:09 2004 +0000 1.3 @@ -184,7 +184,7 @@ 1.4 1.5 # NOTE: Conversion to Unicode may be inappropriate. 1.6 1.7 - encoding = self.get_content_type().charset or encoding or "iso-8859-1" 1.8 + encoding = encoding or self.get_content_type().charset or "iso-8859-1" 1.9 fields = {} 1.10 for field_name, field_values in self.get_fields_from_path().items(): 1.11 if type(field_values) == type([]):