Sourcery refactored master branch

aplex/executor.py

@@ -440,7 +440,7 @@ def remove_closed_worker(self, worker_id):
         return target  # For subclass' super(). No need to find it again.
 
     def are_all_workers_closed(self):
-        return False if self._workers else True
+        return not self._workers
 
     def wakeup(self):
         """To wake up form wait_return_item method."""
@@ -885,13 +885,13 @@ def map(self,
         if not futures:
             return []
 
-        if self._awaitable:
-            if not compat.PY36:
-                return self._MapAsyncIterator(futures, end_time, self._loop)
-            return self._map_async_gen(futures, end_time)
-        else:
+        if not self._awaitable:
             return self._map_gen(futures, end_time)
 
+        if not compat.PY36:
+            return self._MapAsyncIterator(futures, end_time, self._loop)
+        return self._map_async_gen(futures, end_time)
+
 
     if compat.PY36:
         # If statement with variable condition can not prevent Python3.5

tests/integration/test_inte_executors.py

@@ -98,7 +98,7 @@ def test_map_return_order(self, executor_factory, work, awaitable):
         if awaitable:
             results = tuple(self._async_for_consumer(map_results))
         else:
-            results = tuple(j for j in map_results)
+            results = tuple(map_results)
 
         assert results == target
 

tests/integration/test_inte_futures.py

@@ -31,11 +31,7 @@ def test_cancel_running(self, executor_factory, awaitable, work):
         executor = executor_factory(awaitable=awaitable)
         future = executor.submit(work)
 
-        if awaitable:
-            concurrent_fut = future._future
-        else:
-            concurrent_fut = future
-
+        concurrent_fut = future._future if awaitable else future
         while not concurrent_fut.running():
             time.sleep(0.1)
         assert not future.done()