From 1e278de4cc9a4181e0747640a960e80efcea1ca9 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 6 Jan 2019 01:19:47 -0500
Subject: Post black reformatting

Applied on top of a pure run of black -l 79 in
I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9,  this set of changes
resolves all remaining flake8 conditions for those codes
we have enabled in setup.cfg.

Included are resolutions for all remaining flake8 issues
including shadowed builtins, long lines, import order, unused
imports, duplicate imports, and docstring issues.

Change-Id: I4f72d3ba1380dd601610ff80b8fb06a2aff8b0fe
---
 lib/sqlalchemy/event/__init__.py | 14 ++++++++++----
 lib/sqlalchemy/event/api.py      |  4 +++-
 lib/sqlalchemy/event/attr.py     | 15 +++++++++------
 lib/sqlalchemy/event/base.py     |  5 ++++-
 lib/sqlalchemy/event/registry.py | 12 +++++-------
 5 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'lib/sqlalchemy/event')

diff --git a/lib/sqlalchemy/event/__init__.py b/lib/sqlalchemy/event/__init__.py
index a7e27e9b6..d38a5e948 100644
--- a/lib/sqlalchemy/event/__init__.py
+++ b/lib/sqlalchemy/event/__init__.py
@@ -5,7 +5,13 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from .api import CANCEL, NO_RETVAL, listen, listens_for, remove, contains
-from .base import Events, dispatcher
-from .attr import RefCollection
-from .legacy import _legacy_signature
+from .api import CANCEL  # noqa
+from .api import contains  # noqa
+from .api import listen  # noqa
+from .api import listens_for  # noqa
+from .api import NO_RETVAL  # noqa
+from .api import remove  # noqa
+from .attr import RefCollection  # noqa
+from .base import dispatcher  # noqa
+from .base import Events  # noqa
+from .legacy import _legacy_signature  # noqa
diff --git a/lib/sqlalchemy/event/api.py b/lib/sqlalchemy/event/api.py
index f9e04503c..4064b3e21 100644
--- a/lib/sqlalchemy/event/api.py
+++ b/lib/sqlalchemy/event/api.py
@@ -10,9 +10,11 @@
 """
 from __future__ import absolute_import
 
-from .. import util, exc
 from .base import _registrars
 from .registry import _EventKey
+from .. import exc
+from .. import util
+
 
 CANCEL = util.symbol("CANCEL")
 NO_RETVAL = util.symbol("NO_RETVAL")
diff --git a/lib/sqlalchemy/event/attr.py b/lib/sqlalchemy/event/attr.py
index 31a9f28ca..451e0621a 100644
--- a/lib/sqlalchemy/event/attr.py
+++ b/lib/sqlalchemy/event/attr.py
@@ -29,15 +29,18 @@ as well as support for subclass propagation (e.g. events assigned to
 
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
+from __future__ import with_statement
+
+import collections
+from itertools import chain
+import weakref
+
+from . import legacy
+from . import registry
 from .. import exc
 from .. import util
 from ..util import threading
-from . import registry
-from . import legacy
-from itertools import chain
-import weakref
-import collections
 
 
 class RefCollection(util.MemoizedSlots):
diff --git a/lib/sqlalchemy/event/base.py b/lib/sqlalchemy/event/base.py
index c750be70a..6e3027214 100644
--- a/lib/sqlalchemy/event/base.py
+++ b/lib/sqlalchemy/event/base.py
@@ -19,8 +19,11 @@ from __future__ import absolute_import
 
 import weakref
 
+from .attr import _ClsLevelDispatch
+from .attr import _EmptyListener
+from .attr import _JoinedListener
 from .. import util
-from .attr import _ClsLevelDispatch, _EmptyListener, _JoinedListener
+
 
 _registrars = util.defaultdict(list)
 
diff --git a/lib/sqlalchemy/event/registry.py b/lib/sqlalchemy/event/registry.py
index c862ae403..86d323982 100644
--- a/lib/sqlalchemy/event/registry.py
+++ b/lib/sqlalchemy/event/registry.py
@@ -17,10 +17,12 @@ an equivalent :class:`._EventKey`.
 
 from __future__ import absolute_import
 
-import weakref
 import collections
 import types
-from .. import exc, util
+import weakref
+
+from .. import exc
+from .. import util
 
 
 _key_to_collection = collections.defaultdict(dict)
@@ -236,11 +238,7 @@ class _EventKey(object):
         self, propagate=False, insert=False, named=False, retval=None
     ):
 
-        target, identifier, fn = (
-            self.dispatch_target,
-            self.identifier,
-            self._listen_fn,
-        )
+        target, identifier = self.dispatch_target, self.identifier
 
         dispatch_collection = getattr(target.dispatch, identifier)
 
-- 
cgit v1.2.1