[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - BaseRequest.py:1.49.4.7 Converters.py:1.18.4.6 HTTPRequest.py:1.80.2.7 HTTPResponse.py:1.69.2.5

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv14507

Modified Files:
      Tag: chrism-install-branch
	BaseRequest.py Converters.py HTTPRequest.py HTTPResponse.py 
Log Message:
Merge with HEAD.


=== Zope/lib/python/ZPublisher/BaseRequest.py 1.49.4.6 => 1.49.4.7 ===


=== Zope/lib/python/ZPublisher/Converters.py 1.18.4.5 => 1.18.4.6 ===


=== Zope/lib/python/ZPublisher/HTTPRequest.py 1.80.2.6 => 1.80.2.7 ===
--- Zope/lib/python/ZPublisher/HTTPRequest.py:1.80.2.6	Sat Oct 26 15:51:50 2002
+++ Zope/lib/python/ZPublisher/HTTPRequest.py	Sun Nov 24 18:57:27 2002
@@ -760,6 +760,9 @@
                                     taintedform[tainted_key] = copied
                                 else:
                                     taintedform[tainted_key] = [copied]
+                            elif not isinstance(taintedform[tainted_key], lt):
+                                taintedform[tainted_key] = [
+                                    taintedform[tainted_key]]
                             taintedform[tainted_key].append(tainted)
 
                         elif taintedform.has_key(tainted_key):


=== Zope/lib/python/ZPublisher/HTTPResponse.py 1.69.2.4 => 1.69.2.5 ===