Drop old python (#288)

* cleanup

* flake8

* more cleanup

* tweak travis config

* move tests

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 
 python:
-    - 3.5
+    - 3.5.3
     - 3.6
 
 env:

Makefile

@@ -4,8 +4,7 @@ FLAGS=
 
 
 flake:
-	exclude=$$(python -c "import sys;sys.stdout.write('--exclude tests/pep492') if sys.version_info[:3] < (3, 5, 0) else None"); \
-	flake8 aiomysql tests $$exclude
+	flake8 aiomysql tests examples
 
 test: flake
 	py.test -s $(FLAGS) ./tests/

README.rst

@@ -137,8 +137,7 @@ for aiopg_ user.:
 Requirements
 ------------
 
-* Python_ 3.3+
-* asyncio_ or Python_ 3.4+
+* Python_ 3.5.3+
 * PyMySQL_
 
 

aiomysql/connection.py

@@ -41,8 +41,7 @@
 
 # from aiomysql.utils import _convert_to_str
 from .cursors import Cursor
-from .utils import (_ConnectionContextManager, _ContextManager,
-                    create_future)
+from .utils import _ConnectionContextManager, _ContextManager
 # from .log import logger
 
 DEFAULT_USER = getpass.getuser()
@@ -384,7 +383,7 @@ def cursor(self, cursor=None):
             cur = cursor(self, self._echo)
         else:
             cur = self.cursorclass(self, self._echo)
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         fut.set_result(cur)
         return _ContextManager(fut)
 

aiomysql/cursors.py

@@ -7,7 +7,6 @@
     NotSupportedError, ProgrammingError)
 
 from .log import logger
-from .utils import create_future
 
 
 # https://github.com/PyMySQL/PyMySQL/blob/master/pymysql/cursors.py#L11-L18
@@ -362,15 +361,15 @@ async def callproc(self, procname, args=()):
     def fetchone(self):
         """Fetch the next row """
         self._check_executed()
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
 
         if self._rows is None or self._rownumber >= len(self._rows):
             fut.set_result(None)
             return fut
         result = self._rows[self._rownumber]
         self._rownumber += 1
 
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         fut.set_result(result)
         return fut
 
@@ -386,7 +385,7 @@ def fetchmany(self, size=None):
         :returns: ``list`` of fetched rows
         """
         self._check_executed()
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         if self._rows is None:
             fut.set_result([])
             return fut
@@ -403,7 +402,7 @@ def fetchall(self):
         :returns: ``list`` of fetched rows
         """
         self._check_executed()
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         if self._rows is None:
             fut.set_result([])
             return fut
@@ -443,7 +442,7 @@ def scroll(self, value, mode='relative'):
             raise IndexError("out of range")
         self._rownumber = r
 
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         fut.set_result(None)
         return fut
 

aiomysql/pool.py

@@ -7,7 +7,7 @@
 
 from .connection import connect
 from .utils import (_PoolContextManager, _PoolConnectionContextManager,
-                    _PoolAcquireContextManager, create_future, create_task)
+                    _PoolAcquireContextManager)
 
 
 def create_pool(minsize=1, maxsize=10, echo=False, pool_recycle=-1,
@@ -194,7 +194,7 @@ def release(self, conn):
 
         This is **NOT** a coroutine.
         """
-        fut = create_future(self._loop)
+        fut = self._loop.create_future()
         fut.set_result(None)
 
         if conn in self._terminated:
@@ -212,7 +212,7 @@ def release(self, conn):
                 conn.close()
             else:
                 self._free.append(conn)
-            fut = create_task(self._wakeup(), self._loop)
+            fut = self._loop.create_task(self._wakeup())
         return fut
 
     def get(self):

aiomysql/sa/result.py

@@ -7,7 +7,6 @@
 from sqlalchemy.sql import expression, sqltypes
 
 from . import exc
-from ..utils import create_task
 
 
 async def create_result_proxy(connection, cursor, dialect):
@@ -239,7 +238,7 @@ async def _prepare(self):
             self._metadata = ResultMetaData(self, cursor.description)
 
             def callback(wr):
-                create_task(cursor.close(), loop)
+                loop.create_task(cursor.close())
             self._weak = weakref.ref(self, callback)
         else:
             self._metadata = None

aiomysql/utils.py

@@ -1,26 +1,6 @@
-import asyncio
-
 from collections.abc import Coroutine
 
 
-def create_future(loop):
-    """Compatibility wrapper for the loop.create_future() call introduced in
-    3.5.2."""
-    if hasattr(loop, 'create_future'):
-        return loop.create_future()
-    else:
-        return asyncio.Future(loop=loop)
-
-
-def create_task(coro, loop):
-    """Compatibility wrapper for the loop.create_task() call introduced in
-    3.4.2."""
-    if hasattr(loop, 'create_task'):
-        return loop.create_task(coro)
-    else:
-        return asyncio.Task(coro, loop=loop)
-
-
 class _ContextManager(Coroutine):
 
     __slots__ = ('_coro', '_obj')
@@ -169,9 +149,3 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
         finally:
             self._pool = None
             self._conn = None
-
-
-try:
-    asyncio.coroutines._COROUTINE_TYPES += (_ContextManager,)
-except Exception:
-    pass

examples/example_executemany_oldstyle.py

@@ -40,4 +40,5 @@ def test_example_executemany():
     yield from cur.close()
     conn.close()
 
+
 loop.run_until_complete(test_example_executemany())

examples/example_oldstyle.py

@@ -19,4 +19,5 @@ def test_example():
     yield from cur.close()
     conn.close()
 
+
 loop.run_until_complete(test_example())

examples/example_pool_oldstyle.py

@@ -19,4 +19,5 @@ def test_example():
         pool.close()
         yield from pool.wait_closed()
 
+
 loop.run_until_complete(test_example())

examples/example_transaction_oldstyle.py

@@ -56,4 +56,5 @@ def test_example_transaction():
     yield from cursor.close()
     conn.close()
 
+
 loop.run_until_complete(test_example_transaction())

setup.py

@@ -8,19 +8,16 @@
 
 PY_VER = sys.version_info
 
-if PY_VER >= (3, 4):
-    pass
-elif PY_VER >= (3, 3):
-    install_requires.append('asyncio')
-else:
-    raise RuntimeError("aiomysql doesn't suppport Python earllier than 3.3")
+
+if not PY_VER >= (3, 5, 3):
+    raise RuntimeError("aiomysql doesn't support Python earlier than 3.5.3")
 
 
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
 
-extras_require = {'sa': ['sqlalchemy>=0.9'], }
+extras_require = {'sa': ['sqlalchemy>=1.0'], }
 
 
 def read_version():
@@ -40,9 +37,8 @@ def read_version():
     'License :: OSI Approved :: MIT License',
     'Intended Audience :: Developers',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
     'Operating System :: POSIX',
     'Environment :: Web Environment',
     'Development Status :: 3 - Alpha',