1.1 --- a/WebStack/BaseHTTPRequestHandler.py Mon Sep 06 21:36:02 2004 +0000
1.2 +++ b/WebStack/BaseHTTPRequestHandler.py Sun Sep 12 18:08:18 2004 +0000
1.3 @@ -329,10 +329,20 @@
1.4 # Unicode can upset this operation. Using either the specified charset
1.5 # or a default encoding.
1.6
1.7 + encoding = self.get_response_stream_encoding()
1.8 + return ConvertingStream(self.content, encoding)
1.9 +
1.10 + def get_response_stream_encoding(self):
1.11 +
1.12 + """
1.13 + Returns the response stream encoding.
1.14 + """
1.15 +
1.16 if self.content_type:
1.17 encoding = self.content_type.charset
1.18 - encoding = encoding or self.default_charset
1.19 - return ConvertingStream(self.content, encoding)
1.20 + else:
1.21 + encoding = None
1.22 + return encoding or self.default_charset
1.23
1.24 def get_response_code(self):
1.25
2.1 --- a/WebStack/CGI.py Mon Sep 06 21:36:02 2004 +0000
2.2 +++ b/WebStack/CGI.py Sun Sep 12 18:08:18 2004 +0000
2.3 @@ -319,10 +319,20 @@
2.4 # Unicode can upset this operation. Using either the specified charset
2.5 # or a default encoding.
2.6
2.7 + encoding = self.get_response_stream_encoding()
2.8 + return ConvertingStream(self.content, encoding)
2.9 +
2.10 + def get_response_stream_encoding(self):
2.11 +
2.12 + """
2.13 + Returns the response stream encoding.
2.14 + """
2.15 +
2.16 if self.content_type:
2.17 encoding = self.content_type.charset
2.18 - encoding = encoding or self.default_charset
2.19 - return ConvertingStream(self.content, encoding)
2.20 + else:
2.21 + encoding = None
2.22 + return encoding or self.default_charset
2.23
2.24 def get_response_code(self):
2.25
3.1 --- a/WebStack/Generic.py Mon Sep 06 21:36:02 2004 +0000
3.2 +++ b/WebStack/Generic.py Sun Sep 12 18:08:18 2004 +0000
3.3 @@ -369,6 +369,14 @@
3.4
3.5 raise NotImplementedError, "get_response_stream"
3.6
3.7 + def get_response_stream_encoding(self):
3.8 +
3.9 + """
3.10 + Returns the response stream encoding.
3.11 + """
3.12 +
3.13 + raise NotImplementedError, "get_response_stream_encoding"
3.14 +
3.15 def get_response_code(self):
3.16
3.17 """
4.1 --- a/WebStack/JavaServlet.py Mon Sep 06 21:36:02 2004 +0000
4.2 +++ b/WebStack/JavaServlet.py Sun Sep 12 18:08:18 2004 +0000
4.3 @@ -365,6 +365,14 @@
4.4
4.5 return self.response.getWriter()
4.6
4.7 + def get_response_stream_encoding(self):
4.8 +
4.9 + """
4.10 + Returns the response stream encoding.
4.11 + """
4.12 +
4.13 + return self.response.getCharacterEncoding()
4.14 +
4.15 def get_response_code(self):
4.16
4.17 """
5.1 --- a/WebStack/ModPython.py Mon Sep 06 21:36:02 2004 +0000
5.2 +++ b/WebStack/ModPython.py Sun Sep 12 18:08:18 2004 +0000
5.3 @@ -300,10 +300,20 @@
5.4 # Unicode can upset this operation. Using either the specified charset
5.5 # or a default encoding.
5.6
5.7 + encoding = self.get_response_stream_encoding()
5.8 + return ConvertingStream(self.trans, encoding)
5.9 +
5.10 + def get_response_stream_encoding(self):
5.11 +
5.12 + """
5.13 + Returns the response stream encoding.
5.14 + """
5.15 +
5.16 if self.content_type:
5.17 encoding = self.content_type.charset
5.18 - encoding = encoding or self.default_charset
5.19 - return ConvertingStream(self.trans, encoding)
5.20 + else:
5.21 + encoding = None
5.22 + return encoding or self.default_charset
5.23
5.24 def get_response_code(self):
5.25
6.1 --- a/WebStack/Twisted.py Mon Sep 06 21:36:02 2004 +0000
6.2 +++ b/WebStack/Twisted.py Sun Sep 12 18:08:18 2004 +0000
6.3 @@ -293,10 +293,20 @@
6.4 # Unicode can upset this operation. Using either the specified charset
6.5 # or a default encoding.
6.6
6.7 + encoding = self.get_response_stream_encoding()
6.8 + return ConvertingStream(self.trans, encoding)
6.9 +
6.10 + def get_response_stream_encoding(self):
6.11 +
6.12 + """
6.13 + Returns the response stream encoding.
6.14 + """
6.15 +
6.16 if self.content_type:
6.17 encoding = self.content_type.charset
6.18 - encoding = encoding or self.default_charset
6.19 - return ConvertingStream(self.trans, encoding)
6.20 + else:
6.21 + encoding = None
6.22 + return encoding or self.default_charset
6.23
6.24 def get_response_code(self):
6.25
7.1 --- a/WebStack/Webware.py Mon Sep 06 21:36:02 2004 +0000
7.2 +++ b/WebStack/Webware.py Sun Sep 12 18:08:18 2004 +0000
7.3 @@ -284,10 +284,20 @@
7.4 # Unicode can upset this operation. Using either the specified charset
7.5 # or a default encoding.
7.6
7.7 + encoding = self.get_response_stream_encoding()
7.8 + return ConvertingStream(self.trans.response(), encoding)
7.9 +
7.10 + def get_response_stream_encoding(self):
7.11 +
7.12 + """
7.13 + Returns the response stream encoding.
7.14 + """
7.15 +
7.16 if self.content_type:
7.17 encoding = self.content_type.charset
7.18 - encoding = encoding or self.default_charset
7.19 - return ConvertingStream(self.trans.response(), encoding)
7.20 + else:
7.21 + encoding = None
7.22 + return encoding or self.default_charset
7.23
7.24 def get_response_code(self):
7.25
8.1 --- a/WebStack/Zope.py Mon Sep 06 21:36:02 2004 +0000
8.2 +++ b/WebStack/Zope.py Sun Sep 12 18:08:18 2004 +0000
8.3 @@ -283,10 +283,20 @@
8.4 # Unicode can upset this operation. Using either the specified charset
8.5 # or a default encoding.
8.6
8.7 + encoding = self.get_response_stream_encoding()
8.8 + return ConvertingStream(self.response, encoding)
8.9 +
8.10 + def get_response_stream_encoding(self):
8.11 +
8.12 + """
8.13 + Returns the response stream encoding.
8.14 + """
8.15 +
8.16 if self.content_type:
8.17 encoding = self.content_type.charset
8.18 - encoding = encoding or self.default_charset
8.19 - return ConvertingStream(self.response, encoding)
8.20 + else:
8.21 + encoding = None
8.22 + return encoding or self.default_charset
8.23
8.24 def get_response_code(self):
8.25