Project edits for pr517

.isort.cfg

@@ -0,0 +1,6 @@
+[settings]
+line_length=79
+multi_line_output=3
+include_trailing_comma=True
+indent='    '
+sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

.readthedocs.yml

@@ -0,0 +1,12 @@
+version: 2
+
+build:
+  image: latest
+
+python:
+  version: 3.7
+  install:
+  - requirements: requirements.txt
+  - method: pip
+  path: .
+  system_packages: true

.travis.yml

@@ -8,20 +8,9 @@ services:
 python:
 - "3.5"
 - "3.6"
+- "3.7"
 - "nightly"
 
-.mixtures:
-- &py3_7-base
-  python: "3.7"
-  dist: xenial
-  sudo: required
-jobs:
-  include:
-  - <<: *py3_7-base
-
-  - <<: *py3_7-base
-    env:
-
 install:
 - pip install -U setuptools
 - python setup.py install
@@ -39,6 +28,10 @@ env:
   - PYTHONASYNCIODEBUG=x
   - PYTHONASYNCIODEBUG=
 
+matrix:
+  allow_failures:
+  - python: "nightly"
+
 cache:
   directories:
   - $HOME/.cache/pip

Makefile

@@ -4,12 +4,23 @@ doc:
 	cd docs && make html
 	@echo "open file://`pwd`/docs/_build/html/index.html"
 
-pep:
-	pep8 aiopg examples tests
-
-flake:
-	extra=$$(python -c "import sys;sys.stdout.write('--exclude tests/pep492 --builtins=StopAsyncIteration') if sys.version_info[:3] < (3, 5, 0) else sys.stdout.write('examples')"); \
-	flake8 aiopg tests $$extra
+isort:
+	isort -rc aiopg
+	isort -rc tests
+	isort -rc examples
+
+flake: .flake
+
+.flake: $(shell find aiopg -type f) \
+	    $(shell find tests -type f) \
+	    $(shell find examples -type f)
+	flake8 aiopg tests examples
+	python setup.py check -rms
+	@if ! isort -c -rc aiopg tests examples; then \
+            echo "Import sort errors, run 'make isort' to fix them!!!"; \
+            isort --diff -rc aiopg tests examples; \
+            false; \
+	fi
 
 test: flake
 	pytest -q tests
@@ -22,7 +33,10 @@ cov cover coverage: flake
 	@echo "open file://`pwd`/htmlcov/index.html"
 
 cov-ci: flake
-	py.test -v --cov --cov-report=term tests --pg_tag all
+	py.test -v --cov=aiopg --cov-report=term tests --pg_tag all
+
+clean-pip:
+	pip freeze | grep -v "^-e" | xargs pip uninstall -y
 
 clean:
 	find . -name __pycache__ |xargs rm -rf
@@ -38,4 +52,4 @@ clean:
 	rm -rf docs/_build
 	rm -rf .tox
 
-.PHONY: all pep test vtest cov clean
+.PHONY: all isort flake test vtest cov clean clean-pip

aiopg/connection.py

@@ -1,22 +1,20 @@
 import asyncio
 import contextlib
 import errno
+import platform
 import select
 import sys
 import traceback
 import warnings
 import weakref
-import platform
 
 import psycopg2
-from psycopg2.extensions import (
-    POLL_OK, POLL_READ, POLL_WRITE, POLL_ERROR)
 from psycopg2 import extras
+from psycopg2.extensions import POLL_ERROR, POLL_OK, POLL_READ, POLL_WRITE
 
 from .cursor import Cursor
 from .utils import _ContextManager, create_future
 
-
 __all__ = ('connect',)
 
 

aiopg/cursor.py

@@ -1,10 +1,9 @@
 import asyncio
-import warnings
 
 import psycopg2
 
 from .log import logger
-from .transaction import Transaction, IsolationLevel
+from .transaction import IsolationLevel, Transaction
 from .utils import _TransactionBeginContextManager
 
 
@@ -366,17 +365,6 @@ def timeout(self):
         """Return default timeout for cursor operations."""
         return self._timeout
 
-    def __iter__(self):
-        warnings.warn("Iteration over cursor is deprecated",
-                      DeprecationWarning,
-                      stacklevel=2)
-        while True:
-            row = yield from self.fetchone().__await__()
-            if row is None:
-                return
-            else:
-                yield row
-
     def __aiter__(self):
         return self
 

aiopg/log.py

@@ -2,6 +2,5 @@
 
 import logging
 
-
 # Name the logger after the package.
 logger = logging.getLogger(__package__)

aiopg/pool.py

@@ -3,15 +3,18 @@
 import sys
 import warnings
 
-
 from psycopg2.extensions import TRANSACTION_STATUS_IDLE
 
-from .connection import connect, TIMEOUT
+from .connection import TIMEOUT, connect
 from .log import logger
-from .utils import (_PoolContextManager, _PoolConnectionContextManager,
-                    _PoolCursorContextManager, _PoolAcquireContextManager,
-                    ensure_future, create_future)
-
+from .utils import (
+    _PoolAcquireContextManager,
+    _PoolConnectionContextManager,
+    _PoolContextManager,
+    _PoolCursorContextManager,
+    create_future,
+    ensure_future,
+)
 
 PY_341 = sys.version_info >= (3, 4, 1)
 

aiopg/sa/connection.py

@@ -3,10 +3,14 @@
 from sqlalchemy.sql.dml import UpdateBase
 
 from . import exc
-from .result import ResultProxy
-from .transaction import (RootTransaction, Transaction,
-                          NestedTransaction, TwoPhaseTransaction)
 from ..utils import _SAConnectionContextManager, _TransactionContextManager
+from .result import ResultProxy
+from .transaction import (
+    NestedTransaction,
+    RootTransaction,
+    Transaction,
+    TwoPhaseTransaction,
+)
 
 
 class SAConnection:

aiopg/sa/engine.py

@@ -3,10 +3,10 @@
 
 import aiopg
 
+from ..connection import TIMEOUT
+from ..utils import _PoolAcquireContextManager, _PoolContextManager
 from .connection import SAConnection
 from .exc import InvalidRequestError
-from ..connection import TIMEOUT
-from ..utils import _PoolContextManager, _PoolAcquireContextManager
 
 try:
     from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2

aiopg/transaction.py

@@ -4,6 +4,7 @@
 from abc import ABC, abstractmethod
 
 import psycopg2
+
 from aiopg.utils import _TransactionPointContextManager
 
 __all__ = ('IsolationLevel', 'Transaction')

aiopg/utils.py

@@ -1,7 +1,7 @@
-from collections.abc import Coroutine
 import asyncio
-import psycopg2
+from collections.abc import Coroutine
 
+import psycopg2
 
 try:
     ensure_future = asyncio.ensure_future