[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - Test.py:1.40.66.2

[Ken Manheimer]

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

Modified Files:
      Tag: Zope-2_7-branch
	Test.py 
Log Message:
publish_module(): if a form argument was stuck in the extra
dictionary, put it on the request and not just 'other'.

publish(): don't ditch the stdin argument if we have one!


=== Zope/lib/python/ZPublisher/Test.py 1.40.66.1 => 1.40.66.2 ===
--- Zope/lib/python/ZPublisher/Test.py:1.40.66.1	Mon Nov 17 17:34:19 2003
+++ Zope/lib/python/ZPublisher/Test.py	Fri Mar  5 19:13:55 2004
@@ -188,7 +188,11 @@
                 stdout=response.stdout
             if request is None:
                 request=Request(stdin, environ, response)
-            for k, v in extra.items(): request[k]=v
+            for k, v in extra.items():
+                request[k] = v
+                if k == "form":
+                    # Force directly to request, in addition to request.other.
+                    request.form = v
             response = publish(request, module_name, after_list, debug=debug)
         except SystemExit, v:
             must_die=sys.exc_info()
@@ -377,7 +381,8 @@
             else:
                 stdout=sys.stdout
 
-        publish_module(file, environ=env, stdout=stdout, extra=extra)
+        publish_module(file, environ=env, stdin=stdin,
+                       stdout=stdout, extra=extra)
         print '\n%s\n' % ('_'*60)
 
 if __name__ == "__main__": main()