[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - Publish.py:1.164.2.2.6.2

Chris McDonough chrism at plope.com
Wed Mar 24 02:50:18 EST 2004


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

Modified Files:
      Tag: chrism-publishfile-branch
	Publish.py 
Log Message:
Don't use a setBodyProducer API... keep the publisher the way it is.

Use an interface to denote that something is a producer.

Don't use an fcplaceholder marker class.

Fix a bug in refactoring of range support.



=== Zope/lib/python/ZPublisher/Publish.py 1.164.2.2.6.1 => 1.164.2.2.6.2 ===
--- Zope/lib/python/ZPublisher/Publish.py:1.164.2.2.6.1	Sun Mar 21 14:42:25 2004
+++ Zope/lib/python/ZPublisher/Publish.py	Wed Mar 24 02:50:17 2004
@@ -100,10 +100,7 @@
                       request, bind=1)
 
         if result is not response:
-            if isaproducer(result):
-                response.setBodyProducer(result)
-            else:
-                response.setBody(result)
+            response.setBody(result)
 
         if transactions_manager: transactions_manager.commit()
 
@@ -375,6 +372,3 @@
         return publish_module_standard(module_name, stdin, stdout, stderr,
                                        environ, debug, request, response)
 
-def isaproducer(data):
-    if hasattr(data, 'more'):
-        return 1




More information about the Zope-Checkins mailing list