Merge branch 'master' of github.com:KeepSafe/aiohttp

Author: fafhrd91

aiohttp/streams.py

@@ -363,6 +363,10 @@ def read(self):
         except EofStream:
             return EOF_MARKER
 
+    readany = read
+
 
 class FlowControlChunksQueue(FlowControlDataQueue, ChunksQueue):
     """FlowControlChunksQueue resumes and pauses an underlying stream."""
+
+    readany = FlowControlDataQueue.read

tests/test_client.py

@@ -12,6 +12,11 @@
 import aiohttp
 from aiohttp.client import ClientRequest, ClientResponse, HttpClient
 
+try:
+    import chardet
+except ImportError:
+    chardet = None
+
 
 class RequestTests(unittest.TestCase):
 
@@ -186,9 +191,14 @@ def second_call(*args, **kwargs):
         content.read.side_effect = side_effect
         self.response.close = unittest.mock.Mock()
 
-        res = self.loop.run_until_complete(self.response.text())
-        self.assertEqual(res, '{"тест": "пройден"}')
-        self.assertTrue(self.response.close.called)
+        if chardet is None:
+            self.assertRaises(UnicodeDecodeError,
+                              self.loop.run_until_complete,
+                              self.response.text())
+        else:
+            res = self.loop.run_until_complete(self.response.text())
+            self.assertEqual(res, '{"тест": "пройден"}')
+            self.assertTrue(self.response.close.called)
 
     def test_json(self):
         def side_effect(*args, **kwargs):
@@ -260,9 +270,14 @@ def second_call(*args, **kwargs):
         content.read.side_effect = side_effect
         self.response.close = unittest.mock.Mock()
 
-        res = self.loop.run_until_complete(self.response.json())
-        self.assertEqual(res, {'тест': 'пройден'})
-        self.assertTrue(self.response.close.called)
+        if chardet is None:
+            self.assertRaises(UnicodeDecodeError,
+                              self.loop.run_until_complete,
+                              self.response.json())
+        else:
+            res = self.loop.run_until_complete(self.response.json())
+            self.assertEqual(res, {'тест': 'пройден'})
+            self.assertTrue(self.response.close.called)
 
     def test_override_flow_control(self):
         class MyResponse(ClientResponse):

tests/test_streams.py

@@ -636,10 +636,16 @@ def test_read_until_eof(self):
         self.assertEqual(thing, b'')
         self.assertTrue(self.buffer.at_eof())
 
+    def test_readany(self):
+        self.assertIs(self.buffer.read.__func__, self.buffer.readany.__func__)
+
 
 class FlowControlChunksQueueTests(FlowControlDataQueueTests):
 
     def setUp(self):
         super().setUp()
         self.buffer = streams.FlowControlChunksQueue(self.stream,
                                                      loop=self.loop)
+
+    def test_readany(self):
+        self.assertIs(self.buffer.read.__func__, self.buffer.readany.__func__)