drop support to python <3.5.3 (aio-libs#2435)

* drop support to python <3.5.3

* drop helpers.create_future

* drop helpers.isfuture

* fix rebase

* drop ci specific test on 3.5.3

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: python
 
 python:
-- 3.5.2
 - 3.5
 - &mainstream_python 3.6
 - 3.6-dev

aiohttp/client_reqrep.py

@@ -327,7 +327,7 @@ def update_expect_continue(self, expect=False):
             expect = True
 
         if expect:
-            self._continue = helpers.create_future(self.loop)
+            self._continue = self.loop.create_future()
 
     def update_proxy(self, proxy, proxy_auth, proxy_headers):
         if proxy and not proxy.scheme == 'http':

aiohttp/client_ws.py

@@ -6,7 +6,7 @@
 import async_timeout
 
 from .client_exceptions import ClientError
-from .helpers import PY_352, call_later, create_future
+from .helpers import call_later
 from .http import (WS_CLOSED_MESSAGE, WS_CLOSING_MESSAGE, WebSocketError,
                    WSMessage, WSMsgType)
 
@@ -186,7 +186,7 @@ async def receive(self, timeout=None):
                 return WS_CLOSED_MESSAGE
 
             try:
-                self._waiting = create_future(self._loop)
+                self._waiting = self._loop.create_future()
                 try:
                     with async_timeout.timeout(
                             timeout or self._receive_timeout,
@@ -253,9 +253,6 @@ async def receive_json(self, *, loads=json.loads, timeout=None):
     def __aiter__(self):
         return self
 
-    if not PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     async def __anext__(self):
         msg = await self.receive()
         if msg.type in (WSMsgType.CLOSE,

aiohttp/connector.py

@@ -370,7 +370,7 @@ async def connect(self, req):
 
         # Wait if there are no available connections.
         if available <= 0:
-            fut = helpers.create_future(self._loop)
+            fut = self._loop.create_future()
 
             # This connection will now count towards the limit.
             waiters = self._waiters[key]

aiohttp/helpers.py

@@ -9,7 +9,6 @@
 import inspect
 import os
 import re
-import sys
 import time
 import warnings
 import weakref
@@ -29,9 +28,6 @@
 from .log import client_logger
 
 
-PY_352 = sys.version_info >= (3, 5, 2)
-
-
 __all__ = ('BasicAuth',)
 
 
@@ -135,13 +131,6 @@ def deprecated_noop(message):
 coroutines._DEBUG = old_debug
 
 
-try:
-    from asyncio import isfuture
-except ImportError:
-    def isfuture(fut):
-        return isinstance(fut, asyncio.Future)
-
-
 class BasicAuth(namedtuple('BasicAuth', ['login', 'password', 'encoding'])):
     """Http basic authentication helper."""
 
@@ -219,16 +208,6 @@ def proxies_from_env():
     return ret
 
 
-if PY_352:
-    def create_future(loop):
-        return loop.create_future()
-else:
-    def create_future(loop):  # pragma: no cover
-        """Compatibility wrapper for the loop.create_future() call introduced in
-        3.5.2."""
-        return asyncio.Future(loop=loop)
-
-
 def current_task(loop=None):
     if loop is None:
         loop = asyncio.get_event_loop()

aiohttp/http_writer.py

@@ -6,7 +6,7 @@
 import zlib
 
 from .abc import AbstractPayloadWriter
-from .helpers import create_future, noop
+from .helpers import noop
 
 
 __all__ = ('PayloadWriter', 'HttpVersion', 'HttpVersion10', 'HttpVersion11',
@@ -292,6 +292,6 @@ def drain(self, last=False):
         else:
             # wait for transport
             if self._drain_waiter is None:
-                self._drain_waiter = create_future(self.loop)
+                self._drain_waiter = self.loop.create_future()
 
             yield from self._drain_waiter

aiohttp/multipart.py

@@ -13,7 +13,7 @@
 
 from .hdrs import (CONTENT_DISPOSITION, CONTENT_ENCODING, CONTENT_LENGTH,
                    CONTENT_TRANSFER_ENCODING, CONTENT_TYPE)
-from .helpers import CHAR, PY_352, TOKEN, parse_mimetype, reify
+from .helpers import CHAR, TOKEN, parse_mimetype, reify
 from .http import HttpParser
 from .payload import (BytesPayload, LookupError, Payload, StringPayload,
                       get_payload, payload_type)
@@ -172,9 +172,6 @@ def __init__(self, resp, stream):
     def __aiter__(self):
         return self
 
-    if not PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     @asyncio.coroutine
     def __anext__(self):
         part = yield from self.next()
@@ -223,9 +220,6 @@ def __init__(self, boundary, headers, content):
     def __aiter__(self):
         return self
 
-    if not PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     @asyncio.coroutine
     def __anext__(self):
         part = yield from self.next()
@@ -545,9 +539,6 @@ def __init__(self, headers, content):
     def __aiter__(self):
         return self
 
-    if not PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     @asyncio.coroutine
     def __anext__(self):
         part = yield from self.next()

aiohttp/signals.py

@@ -2,7 +2,6 @@
 from itertools import count
 
 from aiohttp.frozenlist import FrozenList
-from aiohttp.helpers import isfuture
 
 
 class BaseSignal(FrozenList):
@@ -12,7 +11,7 @@ class BaseSignal(FrozenList):
     async def _send(self, *args, **kwargs):
         for receiver in self:
             res = receiver(*args, **kwargs)
-            if asyncio.iscoroutine(res) or isfuture(res):
+            if asyncio.iscoroutine(res) or asyncio.isfuture(res):
                 await res
 
 

aiohttp/streams.py

@@ -1,7 +1,6 @@
 import asyncio
 import collections
 
-from . import helpers
 from .log import internal_logger
 
 
@@ -25,9 +24,6 @@ def __init__(self, read_func):
     def __aiter__(self):
         return self
 
-    if not helpers.PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     async def __anext__(self):
         try:
             rv = await self.read_func()
@@ -51,9 +47,6 @@ class AsyncStreamReaderMixin:
     def __aiter__(self):
         return AsyncStreamIterator(self.readline)
 
-    if not helpers.PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     def iter_chunked(self, n):
         """Returns an asynchronous iterator that yields chunks of size n.
 
@@ -190,7 +183,7 @@ async def wait_eof(self):
             return
 
         assert self._eof_waiter is None
-        self._eof_waiter = helpers.create_future(self._loop)
+        self._eof_waiter = self._loop.create_future()
         try:
             await self._eof_waiter
         finally:
@@ -247,7 +240,7 @@ async def _wait(self, func_name):
             raise RuntimeError('%s() called while another coroutine is '
                                'already waiting for incoming data' % func_name)
 
-        waiter = self._waiter = helpers.create_future(self._loop)
+        waiter = self._waiter = self._loop.create_future()
         try:
             if self._timer:
                 with self._timer:
@@ -532,7 +525,7 @@ def feed_eof(self):
     async def read(self):
         if not self._buffer and not self._eof:
             assert not self._waiter
-            self._waiter = helpers.create_future(self._loop)
+            self._waiter = self._loop.create_future()
             try:
                 await self._waiter
             except (asyncio.CancelledError, asyncio.TimeoutError):
@@ -552,9 +545,6 @@ async def read(self):
     def __aiter__(self):
         return AsyncStreamIterator(self.read)
 
-    if not helpers.PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
 
 class ChunksQueue(DataQueue):
     """Like a :class:`DataQueue`, but for binary chunked data transfer."""

aiohttp/web_fileresponse.py

@@ -3,7 +3,6 @@
 import pathlib
 
 from . import hdrs
-from .helpers import create_future
 from .http_writer import PayloadWriter
 from .log import server_logger
 from .web_exceptions import (HTTPNotModified, HTTPOk, HTTPPartialContent,
@@ -57,7 +56,7 @@ def _sendfile_cb(self, fut, out_fd, in_fd,
     async def sendfile(self, fobj, count):
         if self._transport is None:
             if self._drain_waiter is None:
-                self._drain_waiter = create_future(self.loop)
+                self._drain_waiter = self.loop.create_future()
 
             await self._drain_waiter
 
@@ -70,7 +69,7 @@ async def sendfile(self, fobj, count):
         loop = self.loop
         try:
             await loop.sock_sendall(out_socket, b''.join(self._buffer))
-            fut = create_future(loop)
+            fut = loop.create_future()
             self._sendfile_cb(fut, out_fd, in_fd, offset, count, loop, False)
             await fut
         except Exception:

aiohttp/web_protocol.py

@@ -9,7 +9,7 @@
 from html import escape as html_escape
 
 from . import helpers, http
-from .helpers import CeilTimeout, create_future
+from .helpers import CeilTimeout
 from .http import (HttpProcessingError, HttpRequestParser, PayloadWriter,
                    StreamWriter)
 from .log import access_logger, server_logger
@@ -492,7 +492,7 @@ async def start(self, message, payload, handler):
                                         self._process_keepalive)
 
                             # wait for next request
-                            waiter = create_future(loop)
+                            waiter = loop.create_future()
                             self._waiters.append(waiter)
                             try:
                                 message, payload = await waiter

aiohttp/web_ws.py

@@ -5,7 +5,7 @@
 import async_timeout
 
 from . import hdrs
-from .helpers import PY_352, call_later, create_future
+from .helpers import call_later
 from .http import (WS_CLOSED_MESSAGE, WS_CLOSING_MESSAGE, HttpProcessingError,
                    WebSocketError, WebSocketReader, WSMessage, WSMsgType,
                    do_handshake)
@@ -272,7 +272,7 @@ async def receive(self, timeout=None):
                 return WS_CLOSING_MESSAGE
 
             try:
-                self._waiting = create_future(self._loop)
+                self._waiting = self._loop.create_future()
                 try:
                     with async_timeout.timeout(
                             timeout or self._receive_timeout, loop=self._loop):
@@ -337,9 +337,6 @@ def write(self, data):
     def __aiter__(self):
         return self
 
-    if not PY_352:  # pragma: no cover
-        __aiter__ = asyncio.coroutine(__aiter__)
-
     async def __anext__(self):
         msg = await self.receive()
         if msg.type in (WSMsgType.CLOSE,

aiohttp/worker.py

@@ -10,7 +10,7 @@
 from gunicorn.config import AccessLogFormat as GunicornAccessLogFormat
 from gunicorn.workers import base
 
-from .helpers import AccessLogger, create_future
+from .helpers import AccessLogger
 
 
 try:
@@ -143,7 +143,7 @@ async def _run(self):
     def _wait_next_notify(self):
         self._notify_waiter_done()
 
-        self._notify_waiter = waiter = create_future(self.loop)
+        self._notify_waiter = waiter = self.loop.create_future()
         self.loop.call_later(1.0, self._notify_waiter_done)
 
         return waiter

docs/conf.py

@@ -13,10 +13,11 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
 import codecs
+import os
 import re
+import sys
+
 
 _docs_path = os.path.dirname(__file__)
 _version_path = os.path.abspath(os.path.join(_docs_path,

setup.py

@@ -9,6 +9,7 @@
 from setuptools import Extension, setup
 from setuptools.command.test import test as TestCommand
 
+
 try:
     from Cython.Build import cythonize
     USE_CYTHON = True

tests/test_client_functional.py

@@ -15,7 +15,6 @@
 import aiohttp
 from aiohttp import ServerFingerprintMismatch, hdrs, web
 from aiohttp.abc import AbstractResolver
-from aiohttp.helpers import create_future
 from aiohttp.multipart import MultipartWriter
 
 
@@ -585,7 +584,7 @@ async def handler(request):
 
 async def test_timeout_on_reading_data(loop, test_client, mocker):
     mocker.patch('aiohttp.helpers.ceil').side_effect = ceil
-    fut = create_future(loop=loop)
+    fut = loop.create_future()
 
     async def handler(request):
         resp = web.StreamResponse(headers={'content-length': '100'})

tests/test_client_functional_oldstyle.py

@@ -95,7 +95,7 @@ def run(loop, fut):
             host, port, ssl=sslcontext)
         server = thread_loop.run_until_complete(server_coroutine)
 
-        waiter = helpers.create_future(thread_loop)
+        waiter = thread_loop.create_future()
         loop.call_soon_threadsafe(
             fut.set_result, (thread_loop, waiter,
                              server.sockets[0].getsockname()))
@@ -117,7 +117,7 @@ def run(loop, fut):
             thread_loop.close()
             gc.collect()
 
-    fut = helpers.create_future(loop)
+    fut = loop.create_future()
     server_thread = threading.Thread(target=run, args=(loop, fut))
     server_thread.start()
 
@@ -457,7 +457,7 @@ def test_POST_STREAM_DATA(self):
             with open(fname, 'rb') as f:
                 data = f.read()
 
-            fut = helpers.create_future(self.loop)
+            fut = self.loop.create_future()
 
             @aiohttp.streamer
             async def stream(writer):