pep8 related fixes

10 files changed, 34 insertions, 39 deletions

diff --git a/check.py b/check.py
index 9ab6bcc..6db82d6 100644
--- a/check.py
+++ b/check.py
@@ -1,6 +1,8 @@
 """Search for lines >= 80 chars or with trailing whitespace."""
 
-import sys, os
+import os
+import sys
+
 
 def main():
     args = sys.argv[1:] or os.curdir
@@ -15,6 +17,7 @@ def main():
         else:
             process(arg)
 
+
 def isascii(x):
     try:
         x.encode('ascii')
@@ -22,6 +25,7 @@ def isascii(x):
     except UnicodeError:
         return False
 
+
 def process(fn):
     try:
         f = open(fn)
diff --git a/runtests.py b/runtests.py
index 725bfa2..62f55a4 100644
--- a/runtests.py
+++ b/runtests.py
@@ -25,7 +25,6 @@ import logging
 import os
 import re
 import sys
-import subprocess
 import unittest
 import textwrap
 import importlib.machinery
diff --git a/tests/queues_test.py b/tests/queues_test.py
index 7241ffd..437a1c3 100644
--- a/tests/queues_test.py
+++ b/tests/queues_test.py
@@ -62,7 +62,7 @@ class QueueBasicTests(_QueueTestBase):
             q = queues.Queue(maxsize=1, loop=loop)
             q.put_nowait(1)
             # Start a task that waits to put.
-            t = tasks.Task(q.put(2), loop=loop)
+            tasks.Task(q.put(2), loop=loop)
             # Let it start waiting.
             yield from tasks.sleep(0.1, loop=loop)
             self.assertTrue('_putters[1]' in fn(q))
@@ -280,8 +280,8 @@ class QueueGetTests(_QueueTestBase):
 
     def test_get_with_waiting_putters(self):
         q = queues.Queue(loop=self.loop, maxsize=1)
-        t1 = tasks.Task(q.put('a'), loop=self.loop)
-        t2 = tasks.Task(q.put('b'), loop=self.loop)
+        tasks.Task(q.put('a'), loop=self.loop)
+        tasks.Task(q.put('b'), loop=self.loop)
         test_utils.run_briefly(self.loop)
         self.assertEqual(self.loop.run_until_complete(q.get()), 'a')
         self.assertEqual(self.loop.run_until_complete(q.get()), 'b')
@@ -363,14 +363,14 @@ class QueuePutTests(_QueueTestBase):
     def test_put_cancelled_race(self):
         q = queues.Queue(loop=self.loop, maxsize=1)
 
-        t1 = tasks.Task(q.put('a'), loop=self.loop)
-        t2 = tasks.Task(q.put('b'), loop=self.loop)
-        t3 = tasks.Task(q.put('c'), loop=self.loop)
+        tasks.Task(q.put('a'), loop=self.loop)
+        tasks.Task(q.put('c'), loop=self.loop)
+        t = tasks.Task(q.put('b'), loop=self.loop)
 
         test_utils.run_briefly(self.loop)
-        t2.cancel()
+        t.cancel()
         test_utils.run_briefly(self.loop)
-        self.assertTrue(t2.done())
+        self.assertTrue(t.done())
         self.assertEqual(q.get_nowait(), 'a')
         self.assertEqual(q.get_nowait(), 'c')
 
diff --git a/tests/selector_events_test.py b/tests/selector_events_test.py
index 352407c..9596e92 100644
--- a/tests/selector_events_test.py
+++ b/tests/selector_events_test.py
@@ -15,7 +15,6 @@ except ImportError:
 from tulip import futures
 from tulip import selectors
 from tulip import test_utils
-from tulip.events import AbstractEventLoop
 from tulip.protocols import DatagramProtocol, Protocol
 from tulip.selector_events import BaseSelectorEventLoop
 from tulip.selector_events import _SelectorTransport
@@ -525,10 +524,10 @@ class BaseSelectorEventLoopTests(unittest.TestCase):
         reader._cancelled = False
 
         self.loop._add_callback = unittest.mock.Mock()
-        self.loop._process_events([
-            (selectors.SelectorKey(1, 1, selectors.EVENT_READ, (reader, None)),
-             selectors.EVENT_READ),
-            ])
+        self.loop._process_events(
+            [(selectors.SelectorKey(
+                1, 1, selectors.EVENT_READ, (reader, None)),
+              selectors.EVENT_READ)])
         self.assertTrue(self.loop._add_callback.called)
         self.loop._add_callback.assert_called_with(reader)
 
@@ -537,10 +536,10 @@ class BaseSelectorEventLoopTests(unittest.TestCase):
         reader.cancelled = True
 
         self.loop.remove_reader = unittest.mock.Mock()
-        self.loop._process_events([
-            (selectors.SelectorKey(1, 1, selectors.EVENT_READ, (reader, None)),
-             selectors.EVENT_READ),
-            ])
+        self.loop._process_events(
+            [(selectors.SelectorKey(
+                1, 1, selectors.EVENT_READ, (reader, None)),
+             selectors.EVENT_READ)])
         self.loop.remove_reader.assert_called_with(1)
 
     def test_process_events_write(self):
@@ -548,11 +547,10 @@ class BaseSelectorEventLoopTests(unittest.TestCase):
         writer._cancelled = False
 
         self.loop._add_callback = unittest.mock.Mock()
-        self.loop._process_events([
-            (selectors.SelectorKey(1, 1, selectors.EVENT_WRITE,
-                                   (None, writer)),
-             selectors.EVENT_WRITE),
-            ])
+        self.loop._process_events(
+            [(selectors.SelectorKey(1, 1, selectors.EVENT_WRITE,
+                                    (None, writer)),
+              selectors.EVENT_WRITE)])
         self.loop._add_callback.assert_called_with(writer)
 
     def test_process_events_write_cancelled(self):
@@ -560,11 +558,10 @@ class BaseSelectorEventLoopTests(unittest.TestCase):
         writer.cancelled = True
         self.loop.remove_writer = unittest.mock.Mock()
 
-        self.loop._process_events([
-            (selectors.SelectorKey(1, 1, selectors.EVENT_WRITE,
-                                   (None, writer)),
-             selectors.EVENT_WRITE),
-            ])
+        self.loop._process_events(
+            [(selectors.SelectorKey(1, 1, selectors.EVENT_WRITE,
+                                    (None, writer)),
+              selectors.EVENT_WRITE)])
         self.loop.remove_writer.assert_called_with(1)
 
 
diff --git a/tests/tasks_test.py b/tests/tasks_test.py
index 808f368..6cb7b29 100644
--- a/tests/tasks_test.py
+++ b/tests/tasks_test.py
@@ -794,8 +794,6 @@ class TaskTests(unittest.TestCase):
 
         loop = test_utils.TestLoop(gen)
         self.addCleanup(loop.close)
-        completed = set()
-        time_shifted = False
 
         a = tasks.sleep(0.05, 'a', loop=loop)
         b = tasks.sleep(0.10, 'b', loop=loop)
@@ -1059,7 +1057,7 @@ class TaskTests(unittest.TestCase):
             yield fut
 
         task = wait_for_future()
-        with self.assertRaises(RuntimeError) as cm:
+        with self.assertRaises(RuntimeError):
             self.loop.run_until_complete(task)
 
         self.assertFalse(fut.done())
diff --git a/tests/transports_test.py b/tests/transports_test.py
index 5920cda..d2688c3 100644
--- a/tests/transports_test.py
+++ b/tests/transports_test.py
@@ -3,7 +3,6 @@
 import unittest
 import unittest.mock
 
-from tulip import futures
 from tulip import transports
 
 
diff --git a/tests/unix_events_test.py b/tests/unix_events_test.py
index f0b42a3..b78a879 100644
--- a/tests/unix_events_test.py
+++ b/tests/unix_events_test.py
@@ -7,7 +7,6 @@ import pprint
 import signal
 import stat
 import sys
-import tempfile
 import unittest
 import unittest.mock
 
@@ -648,7 +647,6 @@ class UnixWritePipeTransportTests(unittest.TestCase):
         test_utils.run_briefly(self.loop)
         self.protocol.connection_lost.assert_called_with(err)
 
-
     @unittest.mock.patch('os.write')
     def test__write_ready_closing(self, m_write):
         tr = unix_events._UnixWritePipeTransport(
diff --git a/tulip/base_events.py b/tulip/base_events.py
index 6f77d93..5157b5b 100644
--- a/tulip/base_events.py
+++ b/tulip/base_events.py
@@ -430,8 +430,8 @@ class BaseEventLoop(events.AbstractEventLoop):
                         sock.bind(sa)
                     except OSError as err:
                         raise OSError(err.errno, 'error while attempting '
-                                           'to bind on address %r: %s'
-                                           % (sa, err.strerror.lower()))
+                                      'to bind on address %r: %s'
+                                      % (sa, err.strerror.lower()))
                 completed = True
             finally:
                 if not completed:
diff --git a/tulip/test_utils.py b/tulip/test_utils.py
index cf04f21..e73a1d7 100644
--- a/tulip/test_utils.py
+++ b/tulip/test_utils.py
@@ -351,9 +351,9 @@ class TestLoop(base_events.BaseEventLoop):
         super().__init__()
 
         if gen is None:
-            self._check_on_close = False
             def gen():
                 yield
+            self._check_on_close = False
         else:
             self._check_on_close = True
 
diff --git a/tulip/windows_utils.py b/tulip/windows_utils.py
index bf85f31..af9d141 100644
--- a/tulip/windows_utils.py
+++ b/tulip/windows_utils.py
@@ -24,7 +24,7 @@ __all__ = ['socketpair', 'pipe', 'Popen', 'PIPE', 'PipeHandle']
 
 BUFSIZE = 8192
 PIPE = subprocess.PIPE
-_mmap_counter=itertools.count()
+_mmap_counter = itertools.count()
 
 #
 # Replacement for socket.socketpair()