]> granicus.if.org Git - python/commitdiff
asyncio.streams.StreamReader: Add 'at_eof()' method
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 6 Feb 2014 05:14:30 +0000 (00:14 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 6 Feb 2014 05:14:30 +0000 (00:14 -0500)
Lib/asyncio/streams.py
Lib/test/test_asyncio/test_streams.py

index 3da1d10facb3b4610d173da53128e34684d68764..8fc21474e90c8bd0fc129b9f11e0fbbe64d16bac 100644 (file)
@@ -293,6 +293,10 @@ class StreamReader:
             if not waiter.cancelled():
                 waiter.set_result(True)
 
+    def at_eof(self):
+        """Return True if the buffer is empty and 'feed_eof' was called."""
+        return self._eof and not self._buffer
+
     def feed_data(self, data):
         assert not self._eof, 'feed_data after feed_eof'
 
index 83474a87eee962aea5cf84fdee5ff52d66db60f0..ee3fb450291aa31ac7cd7d6d6a98bf8fe04c8174 100644 (file)
@@ -204,6 +204,21 @@ class StreamReaderTests(unittest.TestCase):
         # expected to be empty now.
         self.assertEqual(b'', stream._buffer)
 
+    def test_at_eof(self):
+        stream = asyncio.StreamReader(loop=self.loop)
+        self.assertFalse(stream.at_eof())
+
+        stream.feed_data(b'some data\n')
+        self.assertFalse(stream.at_eof())
+
+        self.loop.run_until_complete(stream.readline())
+        self.assertFalse(stream.at_eof())
+
+        stream.feed_data(b'some data\n')
+        stream.feed_eof()
+        self.loop.run_until_complete(stream.readline())
+        self.assertTrue(stream.at_eof())
+
     def test_readline_limit(self):
         # Read one line. StreamReaders are fed with data after
         # their 'readline' methods are called.