diff --git a/distributed/__init__.py b/distributed/__init__.py index 2a632607cf..ca36613c81 100644 --- a/distributed/__init__.py +++ b/distributed/__init__.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from . import config from dask.config import config from .actor import Actor, ActorFuture diff --git a/distributed/_ipython_utils.py b/distributed/_ipython_utils.py index 512f891158..1a99983378 100644 --- a/distributed/_ipython_utils.py +++ b/distributed/_ipython_utils.py @@ -4,8 +4,6 @@ after which we can import them instead of having our own definitions. """ -from __future__ import print_function - import atexit import os diff --git a/distributed/batched.py b/distributed/batched.py index e17d7b1f1b..a3207b333e 100644 --- a/distributed/batched.py +++ b/distributed/batched.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque import logging diff --git a/distributed/cfexecutor.py b/distributed/cfexecutor.py index eb7bbf0564..34350462f8 100644 --- a/distributed/cfexecutor.py +++ b/distributed/cfexecutor.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import concurrent.futures as cf import weakref diff --git a/distributed/cli/dask_remote.py b/distributed/cli/dask_remote.py index 29cc5c3c78..3118da84ae 100644 --- a/distributed/cli/dask_remote.py +++ b/distributed/cli/dask_remote.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import click from distributed.cli.utils import check_python_3, install_signal_handlers from distributed.submit import _remote diff --git a/distributed/cli/dask_scheduler.py b/distributed/cli/dask_scheduler.py index 54ecd69e59..07e4c98e26 100755 --- a/distributed/cli/dask_scheduler.py +++ b/distributed/cli/dask_scheduler.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import atexit import logging import gc diff --git a/distributed/cli/dask_ssh.py b/distributed/cli/dask_ssh.py index 1d264dc80e..389e032768 100755 --- a/distributed/cli/dask_ssh.py +++ b/distributed/cli/dask_ssh.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from distributed.deploy.ssh import SSHCluster import click diff --git a/distributed/cli/dask_worker.py b/distributed/cli/dask_worker.py index 084d7b59cc..4493139352 100755 --- a/distributed/cli/dask_worker.py +++ b/distributed/cli/dask_worker.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import atexit import logging import multiprocessing diff --git a/distributed/cli/tests/test_dask_scheduler.py b/distributed/cli/tests/test_dask_scheduler.py index 2473747416..cb6cc306b6 100644 --- a/distributed/cli/tests/test_dask_scheduler.py +++ b/distributed/cli/tests/test_dask_scheduler.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest pytest.importorskip("requests") diff --git a/distributed/cli/tests/test_dask_worker.py b/distributed/cli/tests/test_dask_worker.py index e268229767..2dd74737b1 100644 --- a/distributed/cli/tests/test_dask_worker.py +++ b/distributed/cli/tests/test_dask_worker.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest from click.testing import CliRunner diff --git a/distributed/cli/tests/test_tls_cli.py b/distributed/cli/tests/test_tls_cli.py index 37fdc9bb00..def31bc244 100644 --- a/distributed/cli/tests/test_tls_cli.py +++ b/distributed/cli/tests/test_tls_cli.py @@ -1,8 +1,5 @@ -from __future__ import print_function, division, absolute_import - from time import sleep - from distributed import Client from distributed.utils_test import ( popen, diff --git a/distributed/cli/utils.py b/distributed/cli/utils.py index 2c2088a755..4cfb41abe0 100644 --- a/distributed/cli/utils.py +++ b/distributed/cli/utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from tornado import gen from tornado.ioloop import IOLoop diff --git a/distributed/client.py b/distributed/client.py index e1efda4e0d..d9f02ba80f 100644 --- a/distributed/client.py +++ b/distributed/client.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import atexit from collections import defaultdict, Iterator from concurrent.futures import ThreadPoolExecutor, CancelledError diff --git a/distributed/comm/__init__.py b/distributed/comm/__init__.py index e0615b38c7..3537b30157 100644 --- a/distributed/comm/__init__.py +++ b/distributed/comm/__init__.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .addressing import ( parse_address, unparse_address, diff --git a/distributed/comm/addressing.py b/distributed/comm/addressing.py index 54e37b77f6..8480134997 100644 --- a/distributed/comm/addressing.py +++ b/distributed/comm/addressing.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import six import dask diff --git a/distributed/comm/core.py b/distributed/comm/core.py index 869cb9b377..602b316165 100644 --- a/distributed/comm/core.py +++ b/distributed/comm/core.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from abc import ABCMeta, abstractmethod, abstractproperty from datetime import timedelta import logging diff --git a/distributed/comm/inproc.py b/distributed/comm/inproc.py index 3a781479bb..5235b7535f 100644 --- a/distributed/comm/inproc.py +++ b/distributed/comm/inproc.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque, namedtuple import itertools import logging diff --git a/distributed/comm/registry.py b/distributed/comm/registry.py index a646b4d71b..b7fcca912c 100644 --- a/distributed/comm/registry.py +++ b/distributed/comm/registry.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from abc import ABCMeta, abstractmethod from six import with_metaclass diff --git a/distributed/comm/tcp.py b/distributed/comm/tcp.py index d23f381857..36783102b6 100644 --- a/distributed/comm/tcp.py +++ b/distributed/comm/tcp.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import errno import logging import socket diff --git a/distributed/comm/tests/test_comms.py b/distributed/comm/tests/test_comms.py index 7fac117027..620d4b89c9 100644 --- a/distributed/comm/tests/test_comms.py +++ b/distributed/comm/tests/test_comms.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from functools import partial import os import sys diff --git a/distributed/comm/utils.py b/distributed/comm/utils.py index 1e23b25c46..dcc9e9a8b1 100644 --- a/distributed/comm/utils.py +++ b/distributed/comm/utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from concurrent.futures import ThreadPoolExecutor import logging import socket diff --git a/distributed/compatibility.py b/distributed/compatibility.py index fb79353d24..186e66e485 100644 --- a/distributed/compatibility.py +++ b/distributed/compatibility.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import platform import sys diff --git a/distributed/config.py b/distributed/config.py index 5c71cf570c..7e6075125f 100644 --- a/distributed/config.py +++ b/distributed/config.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import logging.config import os diff --git a/distributed/core.py b/distributed/core.py index 7db7b3e29e..f97d2df382 100644 --- a/distributed/core.py +++ b/distributed/core.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from collections import defaultdict, deque from concurrent.futures import CancelledError diff --git a/distributed/counter.py b/distributed/counter.py index d5a3181b11..f41961e87a 100644 --- a/distributed/counter.py +++ b/distributed/counter.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import defaultdict from tornado.ioloop import IOLoop diff --git a/distributed/dashboard/components.py b/distributed/dashboard/components.py index 242a617706..7fb8a6cb02 100644 --- a/distributed/dashboard/components.py +++ b/distributed/dashboard/components.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from bisect import bisect from operator import add diff --git a/distributed/dashboard/core.py b/distributed/dashboard/core.py index a85efb3233..fd6ebef283 100644 --- a/distributed/dashboard/core.py +++ b/distributed/dashboard/core.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from distutils.version import LooseVersion import os import warnings diff --git a/distributed/dashboard/export_tool.py b/distributed/dashboard/export_tool.py index 5d8f1c067a..d93d21b881 100644 --- a/distributed/dashboard/export_tool.py +++ b/distributed/dashboard/export_tool.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import os from bokeh.core.properties import Int, String diff --git a/distributed/dashboard/scheduler.py b/distributed/dashboard/scheduler.py index e41862335c..8396bbcb6a 100644 --- a/distributed/dashboard/scheduler.py +++ b/distributed/dashboard/scheduler.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from functools import partial import logging import math diff --git a/distributed/dashboard/tests/test_components.py b/distributed/dashboard/tests/test_components.py index b12780f199..5e96d788e4 100644 --- a/distributed/dashboard/tests/test_components.py +++ b/distributed/dashboard/tests/test_components.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest pytest.importorskip("bokeh") diff --git a/distributed/dashboard/tests/test_scheduler_bokeh.py b/distributed/dashboard/tests/test_scheduler_bokeh.py index 8544e72d9f..e9ac62aad4 100644 --- a/distributed/dashboard/tests/test_scheduler_bokeh.py +++ b/distributed/dashboard/tests/test_scheduler_bokeh.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import json import re import ssl diff --git a/distributed/dashboard/tests/test_scheduler_bokeh_html.py b/distributed/dashboard/tests/test_scheduler_bokeh_html.py index b66aff02dd..fc19efb081 100644 --- a/distributed/dashboard/tests/test_scheduler_bokeh_html.py +++ b/distributed/dashboard/tests/test_scheduler_bokeh_html.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import json import re import xml.etree.ElementTree diff --git a/distributed/dashboard/tests/test_worker_bokeh.py b/distributed/dashboard/tests/test_worker_bokeh.py index d320ea24ee..c490c825ab 100644 --- a/distributed/dashboard/tests/test_worker_bokeh.py +++ b/distributed/dashboard/tests/test_worker_bokeh.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from operator import add, sub import re from time import sleep diff --git a/distributed/dashboard/utils.py b/distributed/dashboard/utils.py index 8e6b5ff0b9..285f6a5772 100644 --- a/distributed/dashboard/utils.py +++ b/distributed/dashboard/utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from distutils.version import LooseVersion import os diff --git a/distributed/dashboard/worker.py b/distributed/dashboard/worker.py index d8f8adc1c7..402d3fd0a7 100644 --- a/distributed/dashboard/worker.py +++ b/distributed/dashboard/worker.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from functools import partial import logging import math diff --git a/distributed/deploy/__init__.py b/distributed/deploy/__init__.py index 24a86e6d6d..5a5a910600 100644 --- a/distributed/deploy/__init__.py +++ b/distributed/deploy/__init__.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from ..utils import ignoring from .cluster import Cluster diff --git a/distributed/deploy/adaptive.py b/distributed/deploy/adaptive.py index 761a7d300e..9b1d851104 100644 --- a/distributed/deploy/adaptive.py +++ b/distributed/deploy/adaptive.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque import logging diff --git a/distributed/deploy/local.py b/distributed/deploy/local.py index 5b0aec4e80..877a74587e 100644 --- a/distributed/deploy/local.py +++ b/distributed/deploy/local.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import atexit import logging import math diff --git a/distributed/deploy/ssh.py b/distributed/deploy/ssh.py index ba8ed01d1c..9390d00a2a 100644 --- a/distributed/deploy/ssh.py +++ b/distributed/deploy/ssh.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import socket import os diff --git a/distributed/deploy/tests/test_adaptive.py b/distributed/deploy/tests/test_adaptive.py index e0478a9cbd..2d3d2235e2 100644 --- a/distributed/deploy/tests/test_adaptive.py +++ b/distributed/deploy/tests/test_adaptive.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from time import sleep import pytest diff --git a/distributed/deploy/tests/test_local.py b/distributed/deploy/tests/test_local.py index 91a792272e..f434945c3a 100644 --- a/distributed/deploy/tests/test_local.py +++ b/distributed/deploy/tests/test_local.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from functools import partial import gc import multiprocessing diff --git a/distributed/deploy/tests/test_ssh.py b/distributed/deploy/tests/test_ssh.py index a86a8ddd28..492ee2c792 100644 --- a/distributed/deploy/tests/test_ssh.py +++ b/distributed/deploy/tests/test_ssh.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from time import sleep import pytest diff --git a/distributed/diagnostics/__init__.py b/distributed/diagnostics/__init__.py index 9469c3855d..2ab9fac731 100644 --- a/distributed/diagnostics/__init__.py +++ b/distributed/diagnostics/__init__.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from ..utils import ignoring from .graph_layout import GraphLayout diff --git a/distributed/diagnostics/eventstream.py b/distributed/diagnostics/eventstream.py index b9213144d4..c0fde24470 100644 --- a/distributed/diagnostics/eventstream.py +++ b/distributed/diagnostics/eventstream.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging from .plugin import SchedulerPlugin diff --git a/distributed/diagnostics/graph_layout.py b/distributed/diagnostics/graph_layout.py index 62e115a9ad..c81c6edcaf 100644 --- a/distributed/diagnostics/graph_layout.py +++ b/distributed/diagnostics/graph_layout.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .plugin import SchedulerPlugin diff --git a/distributed/diagnostics/plugin.py b/distributed/diagnostics/plugin.py index e1da4378fd..cfe5fa42b4 100644 --- a/distributed/diagnostics/plugin.py +++ b/distributed/diagnostics/plugin.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging logger = logging.getLogger(__name__) diff --git a/distributed/diagnostics/progress.py b/distributed/diagnostics/progress.py index 50c4cd9fad..4136fd17a5 100644 --- a/distributed/diagnostics/progress.py +++ b/distributed/diagnostics/progress.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import defaultdict import logging from timeit import default_timer diff --git a/distributed/diagnostics/progress_stream.py b/distributed/diagnostics/progress_stream.py index b1e3787bd5..038237b89e 100644 --- a/distributed/diagnostics/progress_stream.py +++ b/distributed/diagnostics/progress_stream.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging from toolz import valmap, merge diff --git a/distributed/diagnostics/progressbar.py b/distributed/diagnostics/progressbar.py index 4c9b781f61..01dc9bbea3 100644 --- a/distributed/diagnostics/progressbar.py +++ b/distributed/diagnostics/progressbar.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import html from timeit import default_timer diff --git a/distributed/diagnostics/task_stream.py b/distributed/diagnostics/task_stream.py index 17e62c3045..2491c8a89c 100644 --- a/distributed/diagnostics/task_stream.py +++ b/distributed/diagnostics/task_stream.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque import logging diff --git a/distributed/diagnostics/tests/test_eventstream.py b/distributed/diagnostics/tests/test_eventstream.py index 9139f75eab..a111220b39 100644 --- a/distributed/diagnostics/tests/test_eventstream.py +++ b/distributed/diagnostics/tests/test_eventstream.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import collections import pytest diff --git a/distributed/diagnostics/tests/test_plugin.py b/distributed/diagnostics/tests/test_plugin.py index 1c9ebd7a1a..af29e81674 100644 --- a/distributed/diagnostics/tests/test_plugin.py +++ b/distributed/diagnostics/tests/test_plugin.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from distributed import Worker from distributed.utils_test import inc, gen_cluster from distributed.diagnostics.plugin import SchedulerPlugin diff --git a/distributed/diagnostics/tests/test_progress.py b/distributed/diagnostics/tests/test_progress.py index 097b267024..8e3ba1688c 100644 --- a/distributed/diagnostics/tests/test_progress.py +++ b/distributed/diagnostics/tests/test_progress.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest from tornado import gen diff --git a/distributed/diagnostics/tests/test_progress_stream.py b/distributed/diagnostics/tests/test_progress_stream.py index 9cf89817f3..56da9e974c 100644 --- a/distributed/diagnostics/tests/test_progress_stream.py +++ b/distributed/diagnostics/tests/test_progress_stream.py @@ -1,6 +1,3 @@ -from __future__ import print_function, division, absolute_import - - import pytest pytest.importorskip("bokeh") diff --git a/distributed/diagnostics/tests/test_progressbar.py b/distributed/diagnostics/tests/test_progressbar.py index 4e6ffe8c7e..535efd0e9e 100644 --- a/distributed/diagnostics/tests/test_progressbar.py +++ b/distributed/diagnostics/tests/test_progressbar.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from time import sleep import pytest diff --git a/distributed/diagnostics/tests/test_task_stream.py b/distributed/diagnostics/tests/test_task_stream.py index ad23ca5ae8..58f1c4319f 100644 --- a/distributed/diagnostics/tests/test_task_stream.py +++ b/distributed/diagnostics/tests/test_task_stream.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import os from time import sleep diff --git a/distributed/diagnostics/tests/test_widgets.py b/distributed/diagnostics/tests/test_widgets.py index 033d49251c..03689c88c1 100644 --- a/distributed/diagnostics/tests/test_widgets.py +++ b/distributed/diagnostics/tests/test_widgets.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest pytest.importorskip("ipywidgets") diff --git a/distributed/diskutils.py b/distributed/diskutils.py index 32e6be35ad..64dcf1dfc1 100644 --- a/distributed/diskutils.py +++ b/distributed/diskutils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import errno import glob import logging diff --git a/distributed/lock.py b/distributed/lock.py index 6ad6ab607d..ed3eb4313f 100644 --- a/distributed/lock.py +++ b/distributed/lock.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import defaultdict, deque from datetime import timedelta import logging diff --git a/distributed/metrics.py b/distributed/metrics.py index 6c0bdb4dc7..fefdfeb2e4 100755 --- a/distributed/metrics.py +++ b/distributed/metrics.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import collections from functools import wraps import sys diff --git a/distributed/nanny.py b/distributed/nanny.py index 228e37c283..771b2d11d2 100644 --- a/distributed/nanny.py +++ b/distributed/nanny.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from datetime import timedelta import logging from multiprocessing.queues import Empty diff --git a/distributed/node.py b/distributed/node.py index cbf2c00d8f..8ef610a848 100644 --- a/distributed/node.py +++ b/distributed/node.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import warnings import weakref diff --git a/distributed/process.py b/distributed/process.py index b6e50122c3..889787fe0b 100644 --- a/distributed/process.py +++ b/distributed/process.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import atexit from datetime import timedelta import logging diff --git a/distributed/proctitle.py b/distributed/proctitle.py index 50c9859e17..961c74b91a 100644 --- a/distributed/proctitle.py +++ b/distributed/proctitle.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import os try: diff --git a/distributed/profile.py b/distributed/profile.py index 7f85f46312..274dfcd1d2 100644 --- a/distributed/profile.py +++ b/distributed/profile.py @@ -24,8 +24,6 @@ 'children': {...}}} } """ -from __future__ import print_function, division, absolute_import - import bisect from collections import defaultdict, deque import linecache diff --git a/distributed/protocol/__init__.py b/distributed/protocol/__init__.py index 3f98436f4b..e30786ab4a 100644 --- a/distributed/protocol/__init__.py +++ b/distributed/protocol/__init__.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from functools import partial from .compression import compressions, default_compression diff --git a/distributed/protocol/arrow.py b/distributed/protocol/arrow.py index cac146a575..1f2b4e83e9 100644 --- a/distributed/protocol/arrow.py +++ b/distributed/protocol/arrow.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .serialize import dask_serialize, dask_deserialize import pyarrow diff --git a/distributed/protocol/compression.py b/distributed/protocol/compression.py index f729748acc..5035b465ce 100644 --- a/distributed/protocol/compression.py +++ b/distributed/protocol/compression.py @@ -3,8 +3,6 @@ Includes utilities for determining whether or not to compress """ -from __future__ import print_function, division, absolute_import - import logging import random diff --git a/distributed/protocol/core.py b/distributed/protocol/core.py index d54dd2e533..3937c9c2fc 100644 --- a/distributed/protocol/core.py +++ b/distributed/protocol/core.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import operator diff --git a/distributed/protocol/h5py.py b/distributed/protocol/h5py.py index cf08719e25..e129c16668 100644 --- a/distributed/protocol/h5py.py +++ b/distributed/protocol/h5py.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .serialize import dask_serialize, dask_deserialize import h5py diff --git a/distributed/protocol/keras.py b/distributed/protocol/keras.py index 4c6fc4b4d0..7471a3dbc9 100644 --- a/distributed/protocol/keras.py +++ b/distributed/protocol/keras.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .serialize import dask_serialize, dask_deserialize, serialize, deserialize import keras diff --git a/distributed/protocol/netcdf4.py b/distributed/protocol/netcdf4.py index e04864d2b7..eb83461edd 100644 --- a/distributed/protocol/netcdf4.py +++ b/distributed/protocol/netcdf4.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .serialize import dask_serialize, dask_deserialize, serialize, deserialize import netCDF4 diff --git a/distributed/protocol/numpy.py b/distributed/protocol/numpy.py index b2375569ef..c7e48e63b1 100644 --- a/distributed/protocol/numpy.py +++ b/distributed/protocol/numpy.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import math import numpy as np diff --git a/distributed/protocol/pickle.py b/distributed/protocol/pickle.py index 080bb9037d..629fb962fb 100644 --- a/distributed/protocol/pickle.py +++ b/distributed/protocol/pickle.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import sys diff --git a/distributed/protocol/serialize.py b/distributed/protocol/serialize.py index 9e31470307..0069c6a264 100644 --- a/distributed/protocol/serialize.py +++ b/distributed/protocol/serialize.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from functools import partial import traceback diff --git a/distributed/protocol/sparse.py b/distributed/protocol/sparse.py index b5a437a32a..a22d661f84 100644 --- a/distributed/protocol/sparse.py +++ b/distributed/protocol/sparse.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from .serialize import dask_serialize, dask_deserialize, serialize, deserialize import sparse diff --git a/distributed/protocol/tests/test_numpy.py b/distributed/protocol/tests/test_numpy.py index ed4e32c113..b334683b66 100644 --- a/distributed/protocol/tests/test_numpy.py +++ b/distributed/protocol/tests/test_numpy.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import sys from zlib import crc32 diff --git a/distributed/protocol/tests/test_pandas.py b/distributed/protocol/tests/test_pandas.py index 8f5827f789..104151fb55 100644 --- a/distributed/protocol/tests/test_pandas.py +++ b/distributed/protocol/tests/test_pandas.py @@ -1,6 +1,3 @@ -from __future__ import print_function, division, absolute_import - - import pandas as pd import pandas.util.testing as tm import pytest diff --git a/distributed/protocol/tests/test_protocol.py b/distributed/protocol/tests/test_protocol.py index 2415e01b5f..395c1ca7b9 100644 --- a/distributed/protocol/tests/test_protocol.py +++ b/distributed/protocol/tests/test_protocol.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import sys import dask diff --git a/distributed/protocol/tests/test_protocol_utils.py b/distributed/protocol/tests/test_protocol_utils.py index f4b98ab0e1..d4250fb3c0 100644 --- a/distributed/protocol/tests/test_protocol_utils.py +++ b/distributed/protocol/tests/test_protocol_utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from distributed.protocol.utils import merge_frames, pack_frames, unpack_frames from distributed.utils import ensure_bytes diff --git a/distributed/protocol/tests/test_serialize.py b/distributed/protocol/tests/test_serialize.py index 4f72ec9a53..09297793fc 100644 --- a/distributed/protocol/tests/test_serialize.py +++ b/distributed/protocol/tests/test_serialize.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import copy import pickle diff --git a/distributed/protocol/utils.py b/distributed/protocol/utils.py index caf4bb8833..68de0bebd3 100644 --- a/distributed/protocol/utils.py +++ b/distributed/protocol/utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import struct import msgpack diff --git a/distributed/pytest_resourceleaks.py b/distributed/pytest_resourceleaks.py index bb62d3916d..0119a42572 100644 --- a/distributed/pytest_resourceleaks.py +++ b/distributed/pytest_resourceleaks.py @@ -2,8 +2,6 @@ """ A pytest plugin to trace resource leaks. """ -from __future__ import print_function, division - import collections import gc import time diff --git a/distributed/queues.py b/distributed/queues.py index b97c317ac5..7174c48a63 100644 --- a/distributed/queues.py +++ b/distributed/queues.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import defaultdict import datetime import logging diff --git a/distributed/recreate_exceptions.py b/distributed/recreate_exceptions.py index d02dc4d94f..9138c1fca5 100644 --- a/distributed/recreate_exceptions.py +++ b/distributed/recreate_exceptions.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging from .client import futures_of, wait from .utils import sync, tokey diff --git a/distributed/scheduler.py b/distributed/scheduler.py index 8eec874484..4e769ad420 100644 --- a/distributed/scheduler.py +++ b/distributed/scheduler.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from collections import defaultdict, deque, OrderedDict, Mapping, Set from datetime import timedelta diff --git a/distributed/sizeof.py b/distributed/sizeof.py index 0bc094e35a..bc51b3603a 100644 --- a/distributed/sizeof.py +++ b/distributed/sizeof.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging from dask.sizeof import sizeof diff --git a/distributed/stealing.py b/distributed/stealing.py index afcdf2a1cf..e3537f647b 100644 --- a/distributed/stealing.py +++ b/distributed/stealing.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import defaultdict, deque import logging from math import log diff --git a/distributed/submit.py b/distributed/submit.py index f7e0a2f70a..4cd7fb197a 100644 --- a/distributed/submit.py +++ b/distributed/submit.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import os import socket diff --git a/distributed/system_monitor.py b/distributed/system_monitor.py index 30efc3ceb8..5b3bed3f98 100644 --- a/distributed/system_monitor.py +++ b/distributed/system_monitor.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque import psutil diff --git a/distributed/tests/test_asyncprocess.py b/distributed/tests/test_asyncprocess.py index 3cb3eee14d..e496b35cb9 100644 --- a/distributed/tests/test_asyncprocess.py +++ b/distributed/tests/test_asyncprocess.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from datetime import timedelta import gc import os diff --git a/distributed/tests/test_client.py b/distributed/tests/test_client.py index 5e2ade3f24..99e626de7f 100644 --- a/distributed/tests/test_client.py +++ b/distributed/tests/test_client.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from collections import deque from concurrent.futures import CancelledError diff --git a/distributed/tests/test_client_executor.py b/distributed/tests/test_client_executor.py index a7f10491ef..7d08a63c5b 100644 --- a/distributed/tests/test_client_executor.py +++ b/distributed/tests/test_client_executor.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import random import time diff --git a/distributed/tests/test_collections.py b/distributed/tests/test_collections.py index 7cb509f6ac..7fe8467b14 100644 --- a/distributed/tests/test_collections.py +++ b/distributed/tests/test_collections.py @@ -1,6 +1,3 @@ -from __future__ import print_function, division, absolute_import - - import pytest pytest.importorskip("numpy") diff --git a/distributed/tests/test_config.py b/distributed/tests/test_config.py index cdd4070f7b..2017bb239f 100644 --- a/distributed/tests/test_config.py +++ b/distributed/tests/test_config.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import logging import subprocess import sys diff --git a/distributed/tests/test_core.py b/distributed/tests/test_core.py index 82e4c709be..f91b8b6436 100644 --- a/distributed/tests/test_core.py +++ b/distributed/tests/test_core.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from contextlib import contextmanager import os import socket diff --git a/distributed/tests/test_counter.py b/distributed/tests/test_counter.py index 956a682920..bb38a2812e 100644 --- a/distributed/tests/test_counter.py +++ b/distributed/tests/test_counter.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest from distributed.counter import Counter diff --git a/distributed/tests/test_diskutils.py b/distributed/tests/test_diskutils.py index 561a4cd408..c5cca9d582 100644 --- a/distributed/tests/test_diskutils.py +++ b/distributed/tests/test_diskutils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import functools import gc import os diff --git a/distributed/tests/test_failed_workers.py b/distributed/tests/test_failed_workers.py index 1f27e06705..27bce439da 100644 --- a/distributed/tests/test_failed_workers.py +++ b/distributed/tests/test_failed_workers.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from concurrent.futures import CancelledError import os import random diff --git a/distributed/tests/test_ipython.py b/distributed/tests/test_ipython.py index a6f88ec524..8f2a40e45e 100644 --- a/distributed/tests/test_ipython.py +++ b/distributed/tests/test_ipython.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import mock import pytest diff --git a/distributed/tests/test_locks.py b/distributed/tests/test_locks.py index 9fa9a73787..521a9b4611 100644 --- a/distributed/tests/test_locks.py +++ b/distributed/tests/test_locks.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pickle from time import sleep diff --git a/distributed/tests/test_metrics.py b/distributed/tests/test_metrics.py index cdb4b8ee47..3a27e638ef 100644 --- a/distributed/tests/test_metrics.py +++ b/distributed/tests/test_metrics.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import sys import threading import time diff --git a/distributed/tests/test_nanny.py b/distributed/tests/test_nanny.py index 579af8dbc2..bd8a284df5 100644 --- a/distributed/tests/test_nanny.py +++ b/distributed/tests/test_nanny.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import gc import logging import os diff --git a/distributed/tests/test_queues.py b/distributed/tests/test_queues.py index a28d1e2908..817bfcbcea 100644 --- a/distributed/tests/test_queues.py +++ b/distributed/tests/test_queues.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from datetime import timedelta from time import sleep diff --git a/distributed/tests/test_resources.py b/distributed/tests/test_resources.py index b3f5db36a7..648a191224 100644 --- a/distributed/tests/test_resources.py +++ b/distributed/tests/test_resources.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from time import time from dask import delayed diff --git a/distributed/tests/test_scheduler.py b/distributed/tests/test_scheduler.py index 6401cdd4b9..80cc04c81b 100644 --- a/distributed/tests/test_scheduler.py +++ b/distributed/tests/test_scheduler.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import cloudpickle import pickle from collections import defaultdict diff --git a/distributed/tests/test_security.py b/distributed/tests/test_security.py index 28438c6f35..bfc8358acf 100644 --- a/distributed/tests/test_security.py +++ b/distributed/tests/test_security.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from contextlib import contextmanager import sys diff --git a/distributed/tests/test_steal.py b/distributed/tests/test_steal.py index 45a110bbec..d7c396bb63 100644 --- a/distributed/tests/test_steal.py +++ b/distributed/tests/test_steal.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import itertools from operator import mul import random @@ -114,8 +112,8 @@ def test_worksteal_many_thieves(c, s, *workers): def test_dont_steal_unknown_functions(c, s, a, b): futures = c.map(inc, [1, 2], workers=a.address, allow_other_workers=True) yield wait(futures) - assert len(a.data) == 2 - assert len(b.data) == 0 + assert len(a.data) == 2, [len(a.data), len(b.data)] + assert len(b.data) == 0, [len(a.data), len(b.data)] @gen_cluster(client=True, nthreads=[("127.0.0.1", 1)] * 2) diff --git a/distributed/tests/test_stress.py b/distributed/tests/test_stress.py index b5f5135923..db91ec0c00 100644 --- a/distributed/tests/test_stress.py +++ b/distributed/tests/test_stress.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from concurrent.futures import CancelledError from datetime import timedelta from operator import add diff --git a/distributed/tests/test_submit_cli.py b/distributed/tests/test_submit_cli.py index 04267a28e2..9273261dc9 100644 --- a/distributed/tests/test_submit_cli.py +++ b/distributed/tests/test_submit_cli.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from mock import Mock from tornado import gen diff --git a/distributed/tests/test_system_monitor.py b/distributed/tests/test_system_monitor.py index f42fb8e3e0..f615549a68 100644 --- a/distributed/tests/test_system_monitor.py +++ b/distributed/tests/test_system_monitor.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from time import sleep from distributed.system_monitor import SystemMonitor diff --git a/distributed/tests/test_tls_functional.py b/distributed/tests/test_tls_functional.py index 43c8c667bf..6d0e64b54e 100644 --- a/distributed/tests/test_tls_functional.py +++ b/distributed/tests/test_tls_functional.py @@ -2,10 +2,6 @@ Various functional tests for TLS networking. Most are taken from other test files and adapted. """ - -from __future__ import print_function, division, absolute_import - - from tornado import gen from distributed import Nanny, worker_client, Queue diff --git a/distributed/tests/test_utils.py b/distributed/tests/test_utils.py index c547834626..590f8c877b 100644 --- a/distributed/tests/test_utils.py +++ b/distributed/tests/test_utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import datetime from functools import partial import io diff --git a/distributed/tests/test_utils_comm.py b/distributed/tests/test_utils_comm.py index c9750891dd..224b4b7f18 100644 --- a/distributed/tests/test_utils_comm.py +++ b/distributed/tests/test_utils_comm.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import pytest from distributed.core import rpc diff --git a/distributed/tests/test_utils_perf.py b/distributed/tests/test_utils_perf.py index 95fa816a75..4256548900 100644 --- a/distributed/tests/test_utils_perf.py +++ b/distributed/tests/test_utils_perf.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import contextlib import gc import itertools diff --git a/distributed/tests/test_utils_test.py b/distributed/tests/test_utils_test.py index 05b8066c70..1c6802b563 100755 --- a/distributed/tests/test_utils_test.py +++ b/distributed/tests/test_utils_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from contextlib import contextmanager import socket import sys diff --git a/distributed/tests/test_variable.py b/distributed/tests/test_variable.py index e734cc3094..88f96a241b 100644 --- a/distributed/tests/test_variable.py +++ b/distributed/tests/test_variable.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import random from time import sleep import sys diff --git a/distributed/tests/test_worker.py b/distributed/tests/test_worker.py index c7337d3642..bacd169d35 100644 --- a/distributed/tests/test_worker.py +++ b/distributed/tests/test_worker.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from concurrent.futures import ThreadPoolExecutor from datetime import timedelta import importlib diff --git a/distributed/tests/test_worker_client.py b/distributed/tests/test_worker_client.py index fe1d49def6..14a2d30f7d 100644 --- a/distributed/tests/test_worker_client.py +++ b/distributed/tests/test_worker_client.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import random import threading from time import sleep diff --git a/distributed/threadpoolexecutor.py b/distributed/threadpoolexecutor.py index f4cae3fd88..4477090002 100644 --- a/distributed/threadpoolexecutor.py +++ b/distributed/threadpoolexecutor.py @@ -20,8 +20,6 @@ Copyright 2001-2016 Python Software Foundation; All Rights Reserved """ -from __future__ import print_function, division, absolute_import - from . import _concurrent_futures_thread as thread import os import logging diff --git a/distributed/utils.py b/distributed/utils.py index ab45350bf6..5cc5d414d3 100644 --- a/distributed/utils.py +++ b/distributed/utils.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio import atexit from collections import deque diff --git a/distributed/utils_comm.py b/distributed/utils_comm.py index af393cbd79..f6b4ea36e4 100644 --- a/distributed/utils_comm.py +++ b/distributed/utils_comm.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from collections import defaultdict from itertools import cycle diff --git a/distributed/utils_perf.py b/distributed/utils_perf.py index eb54ea0b38..048d9092d4 100644 --- a/distributed/utils_perf.py +++ b/distributed/utils_perf.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from collections import deque import gc import logging diff --git a/distributed/utils_test.py b/distributed/utils_test.py index 0c7c8958a9..8293bb474e 100644 --- a/distributed/utils_test.py +++ b/distributed/utils_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio import collections from contextlib import contextmanager diff --git a/distributed/variable.py b/distributed/variable.py index 30ffc5bf72..2169c287f6 100644 --- a/distributed/variable.py +++ b/distributed/variable.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio from collections import defaultdict import logging diff --git a/distributed/versions.py b/distributed/versions.py index d6a4409679..a769c9ab03 100644 --- a/distributed/versions.py +++ b/distributed/versions.py @@ -1,7 +1,5 @@ """ utilities for package version introspection """ -from __future__ import print_function, division, absolute_import - import platform import struct import os diff --git a/distributed/worker.py b/distributed/worker.py index ae7ee648ff..b32ab2e52a 100644 --- a/distributed/worker.py +++ b/distributed/worker.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - import asyncio import bisect from collections import defaultdict, deque, MutableMapping diff --git a/distributed/worker_client.py b/distributed/worker_client.py index ff6294430b..a45eb891f7 100644 --- a/distributed/worker_client.py +++ b/distributed/worker_client.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import - from contextlib import contextmanager import warnings