check most specific interface first (IStreamIterator before IUnboundS…

…treamIterator)
zopefoundation · Aug 5, 2015 · dcd81ee · dcd81ee
1 parent 92474cc
commit dcd81ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ZPublisher/WSGIPublisher.py b/src/ZPublisher/WSGIPublisher.py
@@ -137,12 +137,12 @@ def setBody(self, body, title='', is_error=0):
             body.seek(0)
             self.setHeader('Content-Length', '%d' % length)
             self.body = body
-        elif IUnboundStreamIterator.providedBy(body):
+        elif IStreamIterator.providedBy(body):
             self.body = body
-            self._streaming = 1
             HTTPResponse.setBody(self, '', title, is_error)
-        elif IStreamIterator.providedBy(body):
+        elif IUnboundStreamIterator.providedBy(body):
             self.body = body
+            self._streaming = 1
             HTTPResponse.setBody(self, '', title, is_error)
         else:
             HTTPResponse.setBody(self, body, title, is_error)

diff --git a/src/ZPublisher/tests/test_WSGIPublisher.py b/src/ZPublisher/tests/test_WSGIPublisher.py
@@ -157,6 +157,7 @@ def next(self):
         response.setBody(body)
         response.finalize()
         self.assertTrue(body is response.body)
+        self.assertEqual(response._streaming, 1)
 
     def test_setBody_IStreamIterator(self):
         from ZPublisher.Iterators import IStreamIterator
@@ -182,6 +183,7 @@ def __len__(self):
         response.setBody(body)
         response.finalize()
         self.assertTrue(body is response.body)
+        self.assertEqual(response._streaming, 0)
 
     #def test___str__already_wrote_not_chunking(self):
     #    response = self._makeOne()