[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - HTTPRequest.py:1.61.6.14

Martijn Pieters mj@zope.com
Tue, 12 Nov 2002 11:08:06 -0500


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

Modified Files:
      Tag: Zope-2_5-branch
	HTTPRequest.py 
Log Message:
Fix for collector issue #650: Implicit marshalling for lists where the first
two values are tainted failed because no implicit conversion to a list took
place.


=== Zope/lib/python/ZPublisher/HTTPRequest.py 1.61.6.13 => 1.61.6.14 ===
--- Zope/lib/python/ZPublisher/HTTPRequest.py:1.61.6.13	Wed Sep 25 12:09:46 2002
+++ Zope/lib/python/ZPublisher/HTTPRequest.py	Tue Nov 12 11:08:05 2002
@@ -747,6 +747,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):