From 94a0914bbaaeb8f029af4ad09538ab32263c78fa Mon Sep 17 00:00:00 2001 From: "Mr. Outis" Date: Mon, 30 Dec 2019 19:06:03 -0600 Subject: [PATCH] py3: get rid of future imports --- dvc/__init__.py | 2 -- dvc/__main__.py | 2 -- dvc/cache.py | 2 -- dvc/cli.py | 3 --- dvc/command/add.py | 2 -- dvc/command/base.py | 2 -- dvc/command/cache.py | 2 -- dvc/command/checkout.py | 2 -- dvc/command/commit.py | 2 -- dvc/command/config.py | 2 -- dvc/command/daemon.py | 2 -- dvc/command/data_sync.py | 2 -- dvc/command/destroy.py | 2 -- dvc/command/diff.py | 2 -- dvc/command/gc.py | 2 -- dvc/command/get.py | 2 -- dvc/command/get_url.py | 2 -- dvc/command/imp.py | 2 -- dvc/command/imp_url.py | 2 -- dvc/command/init.py | 2 -- dvc/command/install.py | 2 -- dvc/command/lock.py | 2 -- dvc/command/metrics.py | 2 -- dvc/command/move.py | 2 -- dvc/command/pipeline.py | 2 -- dvc/command/remote.py | 2 -- dvc/command/remove.py | 2 -- dvc/command/repro.py | 2 -- dvc/command/root.py | 2 -- dvc/command/run.py | 2 -- dvc/command/status.py | 2 -- dvc/command/unprotect.py | 2 -- dvc/command/update.py | 2 -- dvc/command/version.py | 2 -- dvc/config.py | 1 - dvc/daemon.py | 1 - dvc/dagascii.py | 2 -- dvc/data_cloud.py | 1 - dvc/dependency/__init__.py | 2 -- dvc/dependency/base.py | 2 -- dvc/dependency/gs.py | 2 -- dvc/dependency/hdfs.py | 2 -- dvc/dependency/http.py | 2 -- dvc/dependency/https.py | 2 -- dvc/dependency/local.py | 2 -- dvc/dependency/repo.py | 2 -- dvc/dependency/s3.py | 2 -- dvc/dependency/ssh.py | 2 -- dvc/exceptions.py | 1 - dvc/external_repo.py | 2 -- dvc/ignore.py | 2 -- dvc/istextfile.py | 1 - dvc/lock.py | 1 - dvc/logger.py | 1 - dvc/main.py | 1 - dvc/output/__init__.py | 2 -- dvc/output/base.py | 2 -- dvc/output/gs.py | 2 -- dvc/output/hdfs.py | 2 -- dvc/output/local.py | 2 -- dvc/output/s3.py | 2 -- dvc/output/ssh.py | 2 -- dvc/path_info.py | 3 --- dvc/progress.py | 1 - dvc/prompt.py | 2 -- dvc/remote/__init__.py | 2 -- dvc/remote/azure.py | 3 --- dvc/remote/base.py | 2 -- dvc/remote/gdrive.py | 2 -- dvc/remote/gs.py | 2 -- dvc/remote/hdfs.py | 2 -- dvc/remote/http.py | 2 -- dvc/remote/https.py | 2 -- dvc/remote/local.py | 2 -- dvc/remote/oss.py | 3 --- dvc/remote/s3.py | 1 - dvc/remote/ssh/__init__.py | 2 -- dvc/repo/__init__.py | 2 -- dvc/repo/add.py | 2 -- dvc/repo/checkout.py | 2 -- dvc/repo/diff.py | 2 -- dvc/repo/fetch.py | 2 -- dvc/repo/gc.py | 2 -- dvc/repo/graph.py | 3 --- dvc/repo/metrics/modify.py | 2 -- dvc/repo/metrics/show.py | 2 -- dvc/repo/pull.py | 2 -- dvc/repo/push.py | 2 -- dvc/repo/reproduce.py | 2 -- dvc/repo/run.py | 2 -- dvc/repo/status.py | 2 -- dvc/rwlock.py | 2 -- dvc/scheme.py | 3 --- dvc/scm/__init__.py | 1 - dvc/scm/base.py | 1 - dvc/scm/git/__init__.py | 1 - dvc/stage.py | 2 -- dvc/state.py | 1 - dvc/system.py | 2 -- dvc/updater.py | 2 -- dvc/utils/__init__.py | 1 - dvc/utils/collections.py | 3 --- dvc/utils/compat.py | 1 - dvc/utils/fs.py | 2 -- setup.py | 1 - tests/basic_env.py | 1 - tests/conftest.py | 2 -- tests/dir_helpers.py | 1 - tests/func/test_add.py | 2 -- tests/func/test_commit.py | 2 -- tests/func/test_dependency.py | 2 -- tests/func/test_diff.py | 2 -- tests/func/test_gc.py | 2 -- tests/func/test_get.py | 2 -- tests/func/test_get_url.py | 2 -- tests/func/test_ignore.py | 1 - tests/func/test_import.py | 2 -- tests/func/test_import_url.py | 2 -- tests/func/test_metrics.py | 1 - tests/func/test_repro.py | 2 -- tests/func/test_scm.py | 2 -- tests/func/test_tree.py | 1 - tests/unit/remote/ssh/test_connection.py | 2 -- tests/unit/test_logger.py | 2 -- tests/unit/test_rwlock.py | 2 -- tests/unit/utils/test_http.py | 2 -- 126 files changed, 237 deletions(-) diff --git a/dvc/__init__.py b/dvc/__init__.py index 81bbe6ee3..8d8b10b51 100644 --- a/dvc/__init__.py +++ b/dvc/__init__.py @@ -3,8 +3,6 @@ DVC ---- Make your data science projects reproducible and shareable. """ -from __future__ import unicode_literals - import warnings import dvc.logger diff --git a/dvc/__main__.py b/dvc/__main__.py index bc1d90eba..ccd25dc7c 100644 --- a/dvc/__main__.py +++ b/dvc/__main__.py @@ -1,6 +1,4 @@ """Main entry point for dvc command line tool.""" -from __future__ import unicode_literals - import sys from dvc.main import main diff --git a/dvc/cache.py b/dvc/cache.py index 452197f0c..b29004457 100644 --- a/dvc/cache.py +++ b/dvc/cache.py @@ -1,6 +1,4 @@ """Manages cache of a dvc repo.""" -from __future__ import unicode_literals - import os from collections import defaultdict diff --git a/dvc/cli.py b/dvc/cli.py index ba4c929c3..d4e8045e1 100644 --- a/dvc/cli.py +++ b/dvc/cli.py @@ -1,7 +1,4 @@ """Command line interface for dvc.""" -from __future__ import print_function -from __future__ import unicode_literals - import argparse import logging import sys diff --git a/dvc/command/add.py b/dvc/command/add.py index cd08a966a..58c52e515 100644 --- a/dvc/command/add.py +++ b/dvc/command/add.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/base.py b/dvc/command/base.py index d8ccb2c8d..14fa83d0b 100644 --- a/dvc/command/base.py +++ b/dvc/command/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging diff --git a/dvc/command/cache.py b/dvc/command/cache.py index 264360f8f..752a60714 100644 --- a/dvc/command/cache.py +++ b/dvc/command/cache.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse from dvc.cache import CacheConfig diff --git a/dvc/command/checkout.py b/dvc/command/checkout.py index 507dca252..0e2a533ec 100644 --- a/dvc/command/checkout.py +++ b/dvc/command/checkout.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse from dvc.command.base import append_doc_link diff --git a/dvc/command/commit.py b/dvc/command/commit.py index 2c626e2ae..b078c899d 100644 --- a/dvc/command/commit.py +++ b/dvc/command/commit.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/config.py b/dvc/command/config.py index c8c80b790..13f700c1b 100644 --- a/dvc/command/config.py +++ b/dvc/command/config.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/daemon.py b/dvc/command/daemon.py index b391e6cee..308978415 100644 --- a/dvc/command/daemon.py +++ b/dvc/command/daemon.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.command.base import CmdBaseNoRepo from dvc.command.base import fix_subparsers diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py index 99822b003..9442e2bbb 100644 --- a/dvc/command/data_sync.py +++ b/dvc/command/data_sync.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/destroy.py b/dvc/command/destroy.py index 8559ef1cb..06c00d19c 100644 --- a/dvc/command/destroy.py +++ b/dvc/command/destroy.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/diff.py b/dvc/command/diff.py index 180508896..7e064adda 100644 --- a/dvc/command/diff.py +++ b/dvc/command/diff.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/gc.py b/dvc/command/gc.py index 8890aae6e..7cbffc537 100644 --- a/dvc/command/gc.py +++ b/dvc/command/gc.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging import os diff --git a/dvc/command/get.py b/dvc/command/get.py index e3172782d..9aba35c0d 100644 --- a/dvc/command/get.py +++ b/dvc/command/get.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/get_url.py b/dvc/command/get_url.py index df377d045..7a931cf5f 100644 --- a/dvc/command/get_url.py +++ b/dvc/command/get_url.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 452a481d5..9315f0374 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/imp_url.py b/dvc/command/imp_url.py index e072bc1e3..3aefc40ae 100644 --- a/dvc/command/imp_url.py +++ b/dvc/command/imp_url.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/init.py b/dvc/command/init.py index e7589fca6..671a49c70 100644 --- a/dvc/command/init.py +++ b/dvc/command/init.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/install.py b/dvc/command/install.py index 2ff809212..b86abc476 100644 --- a/dvc/command/install.py +++ b/dvc/command/install.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/lock.py b/dvc/command/lock.py index b89240264..da8333a47 100644 --- a/dvc/command/lock.py +++ b/dvc/command/lock.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/metrics.py b/dvc/command/metrics.py index 7ae0155fd..a2bc2587a 100644 --- a/dvc/command/metrics.py +++ b/dvc/command/metrics.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/move.py b/dvc/command/move.py index 83764f68f..e03eb94de 100644 --- a/dvc/command/move.py +++ b/dvc/command/move.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index abe2d3c0d..08fa9bd4d 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging from dvc.utils.compat import str diff --git a/dvc/command/remote.py b/dvc/command/remote.py index 683c040f4..e39024c68 100644 --- a/dvc/command/remote.py +++ b/dvc/command/remote.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/remove.py b/dvc/command/remove.py index b4b47f98f..f93b4d265 100644 --- a/dvc/command/remove.py +++ b/dvc/command/remove.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/repro.py b/dvc/command/repro.py index 24d4f1276..6fd1b6573 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging import os diff --git a/dvc/command/root.py b/dvc/command/root.py index a5d4208f9..c17dbf914 100644 --- a/dvc/command/root.py +++ b/dvc/command/root.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/run.py b/dvc/command/run.py index 1368eb4bc..aa4f7ded5 100644 --- a/dvc/command/run.py +++ b/dvc/command/run.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/status.py b/dvc/command/status.py index 9f6c90ab0..3774192c0 100644 --- a/dvc/command/status.py +++ b/dvc/command/status.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from dvc.command.data_sync import CmdDataBase diff --git a/dvc/command/unprotect.py b/dvc/command/unprotect.py index 7344f086a..eb6dc8876 100644 --- a/dvc/command/unprotect.py +++ b/dvc/command/unprotect.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/update.py b/dvc/command/update.py index 2b800c9fe..47df68dd6 100644 --- a/dvc/command/update.py +++ b/dvc/command/update.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import logging diff --git a/dvc/command/version.py b/dvc/command/version.py index 8c2c25f00..301dd6554 100644 --- a/dvc/command/version.py +++ b/dvc/command/version.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import argparse import itertools import logging diff --git a/dvc/config.py b/dvc/config.py index 5c71da3d0..c90ed7549 100644 --- a/dvc/config.py +++ b/dvc/config.py @@ -1,5 +1,4 @@ """DVC config objects.""" -from __future__ import unicode_literals import copy import errno diff --git a/dvc/daemon.py b/dvc/daemon.py index 9b36e7f6e..98b8ec10f 100644 --- a/dvc/daemon.py +++ b/dvc/daemon.py @@ -1,5 +1,4 @@ """Launch `dvc daemon` command in a separate detached process.""" -from __future__ import unicode_literals import inspect import logging diff --git a/dvc/dagascii.py b/dvc/dagascii.py index ffe725820..49cfb2f7c 100644 --- a/dvc/dagascii.py +++ b/dvc/dagascii.py @@ -1,6 +1,4 @@ """Draws DAG in ASCII.""" -from __future__ import print_function -from __future__ import unicode_literals import logging import math diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index dcc7546fc..fadd536bd 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -1,5 +1,4 @@ """Manages dvc remotes that user can use with push/pull/status commands.""" -from __future__ import unicode_literals import logging diff --git a/dvc/dependency/__init__.py b/dvc/dependency/__init__.py index 209259475..a963ab380 100644 --- a/dvc/dependency/__init__.py +++ b/dvc/dependency/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import dvc.output as output from dvc.dependency.gs import DependencyGS from dvc.dependency.hdfs import DependencyHDFS diff --git a/dvc/dependency/base.py b/dvc/dependency/base.py index 4f52bf5d0..7a2062b21 100644 --- a/dvc/dependency/base.py +++ b/dvc/dependency/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.exceptions import DvcException diff --git a/dvc/dependency/gs.py b/dvc/dependency/gs.py index 73dda18d6..2bf1ef645 100644 --- a/dvc/dependency/gs.py +++ b/dvc/dependency/gs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.gs import OutputGS diff --git a/dvc/dependency/hdfs.py b/dvc/dependency/hdfs.py index 15da38cda..77503a4b1 100644 --- a/dvc/dependency/hdfs.py +++ b/dvc/dependency/hdfs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.hdfs import OutputHDFS diff --git a/dvc/dependency/http.py b/dvc/dependency/http.py index f958eba31..9f5e26cc9 100644 --- a/dvc/dependency/http.py +++ b/dvc/dependency/http.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.base import OutputBase from dvc.remote.http import RemoteHTTP diff --git a/dvc/dependency/https.py b/dvc/dependency/https.py index 3eb4562de..e23967f39 100644 --- a/dvc/dependency/https.py +++ b/dvc/dependency/https.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from .http import DependencyHTTP from dvc.remote.https import RemoteHTTPS diff --git a/dvc/dependency/local.py b/dvc/dependency/local.py index 60fb124c0..02c77176a 100644 --- a/dvc/dependency/local.py +++ b/dvc/dependency/local.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.local import OutputLOCAL diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index df35e4523..e008f540b 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import os from contextlib import contextmanager diff --git a/dvc/dependency/s3.py b/dvc/dependency/s3.py index 18b960c5f..7ea462c4c 100644 --- a/dvc/dependency/s3.py +++ b/dvc/dependency/s3.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.s3 import OutputS3 diff --git a/dvc/dependency/ssh.py b/dvc/dependency/ssh.py index f09daad52..79a6f3665 100644 --- a/dvc/dependency/ssh.py +++ b/dvc/dependency/ssh.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.dependency.base import DependencyBase from dvc.output.ssh import OutputSSH diff --git a/dvc/exceptions.py b/dvc/exceptions.py index b395b9641..7fb9ddc6c 100644 --- a/dvc/exceptions.py +++ b/dvc/exceptions.py @@ -1,5 +1,4 @@ """Exceptions raised by the dvc.""" -from __future__ import unicode_literals import traceback diff --git a/dvc/external_repo.py b/dvc/external_repo.py index 758d8f421..cf5ecacdd 100644 --- a/dvc/external_repo.py +++ b/dvc/external_repo.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import tempfile from contextlib import contextmanager diff --git a/dvc/ignore.py b/dvc/ignore.py index 64f79068c..95494670a 100644 --- a/dvc/ignore.py +++ b/dvc/ignore.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os diff --git a/dvc/istextfile.py b/dvc/istextfile.py index d26af9911..57b1c3b6c 100644 --- a/dvc/istextfile.py +++ b/dvc/istextfile.py @@ -1,5 +1,4 @@ """Use heuristics to guess if it is a text file or a binary file.""" -from __future__ import unicode_literals from dvc.utils.compat import is_py3 from dvc.utils.compat import open diff --git a/dvc/lock.py b/dvc/lock.py index a8fc08c01..1c850c64f 100644 --- a/dvc/lock.py +++ b/dvc/lock.py @@ -1,5 +1,4 @@ """Manages dvc lock file.""" -from __future__ import unicode_literals import hashlib import os diff --git a/dvc/logger.py b/dvc/logger.py index cbb059ae9..b4b0d9c07 100644 --- a/dvc/logger.py +++ b/dvc/logger.py @@ -1,5 +1,4 @@ """Manages logging configuration for dvc repo.""" -from __future__ import unicode_literals import logging.config import logging.handlers diff --git a/dvc/main.py b/dvc/main.py index 89c9dc775..bbca7ecca 100644 --- a/dvc/main.py +++ b/dvc/main.py @@ -1,5 +1,4 @@ """Main entry point for dvc CLI.""" -from __future__ import unicode_literals import errno import logging diff --git a/dvc/output/__init__.py b/dvc/output/__init__.py index d5ff96c99..cbddb5b37 100644 --- a/dvc/output/__init__.py +++ b/dvc/output/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from voluptuous import Any, Required from dvc.output.base import OutputBase diff --git a/dvc/output/base.py b/dvc/output/base.py index b92a88832..53c4d2cb3 100644 --- a/dvc/output/base.py +++ b/dvc/output/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from copy import copy diff --git a/dvc/output/gs.py b/dvc/output/gs.py index 82fa2d7fa..d2702bb19 100644 --- a/dvc/output/gs.py +++ b/dvc/output/gs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.output.s3 import OutputS3 from dvc.remote.gs import RemoteGS diff --git a/dvc/output/hdfs.py b/dvc/output/hdfs.py index e26f5161b..c5b81f6a9 100644 --- a/dvc/output/hdfs.py +++ b/dvc/output/hdfs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.output.base import OutputBase from dvc.remote.hdfs import RemoteHDFS diff --git a/dvc/output/local.py b/dvc/output/local.py index f698a123a..718e752c5 100644 --- a/dvc/output/local.py +++ b/dvc/output/local.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os diff --git a/dvc/output/s3.py b/dvc/output/s3.py index 2d6df4e28..fce364288 100644 --- a/dvc/output/s3.py +++ b/dvc/output/s3.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.output.base import OutputBase from dvc.remote.s3 import RemoteS3 diff --git a/dvc/output/ssh.py b/dvc/output/ssh.py index 5b4526a20..8ae79e74a 100644 --- a/dvc/output/ssh.py +++ b/dvc/output/ssh.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.output.base import OutputBase from dvc.remote.ssh import RemoteSSH diff --git a/dvc/path_info.py b/dvc/path_info.py index a4a24726e..f0a72bf6f 100644 --- a/dvc/path_info.py +++ b/dvc/path_info.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import os import posixpath import sys diff --git a/dvc/progress.py b/dvc/progress.py index b11fb34f3..b9898a907 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -1,5 +1,4 @@ """Manages progress bars for dvc repo.""" -from __future__ import print_function import logging import sys diff --git a/dvc/prompt.py b/dvc/prompt.py index cec76b3f6..7711dc5fe 100644 --- a/dvc/prompt.py +++ b/dvc/prompt.py @@ -1,6 +1,4 @@ """Manages user prompts.""" -from __future__ import print_function -from __future__ import unicode_literals import logging import sys diff --git a/dvc/remote/__init__.py b/dvc/remote/__init__.py index e2c20a216..6d800fb6c 100644 --- a/dvc/remote/__init__.py +++ b/dvc/remote/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from .config import RemoteConfig from dvc.remote.azure import RemoteAZURE from dvc.remote.gdrive import RemoteGDrive diff --git a/dvc/remote/azure.py b/dvc/remote/azure.py index b991195df..f80586ff6 100644 --- a/dvc/remote/azure.py +++ b/dvc/remote/azure.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import os import re diff --git a/dvc/remote/base.py b/dvc/remote/base.py index cb012a210..b33021530 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno from dvc.utils.compat import basestring, FileNotFoundError, str, urlparse diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py index 38fc819c8..bba3fb950 100644 --- a/dvc/remote/gdrive.py +++ b/dvc/remote/gdrive.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import posixpath import logging diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index 3447da35e..547180c3c 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals, division - import logging from datetime import timedelta from functools import wraps diff --git a/dvc/remote/hdfs.py b/dvc/remote/hdfs.py index 06df65a4a..49579003a 100644 --- a/dvc/remote/hdfs.py +++ b/dvc/remote/hdfs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.utils.compat import FileNotFoundError, urlparse import io import logging diff --git a/dvc/remote/http.py b/dvc/remote/http.py index 98a1e50f5..452f26c76 100644 --- a/dvc/remote/http.py +++ b/dvc/remote/http.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import threading diff --git a/dvc/remote/https.py b/dvc/remote/https.py index eee6a1d80..d8602e589 100644 --- a/dvc/remote/https.py +++ b/dvc/remote/https.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from .http import RemoteHTTP from dvc.scheme import Schemes diff --git a/dvc/remote/local.py b/dvc/remote/local.py index 56a138114..bb2be9356 100644 --- a/dvc/remote/local.py +++ b/dvc/remote/local.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno import logging import os diff --git a/dvc/remote/oss.py b/dvc/remote/oss.py index 0abf1a92e..2eb6cf958 100644 --- a/dvc/remote/oss.py +++ b/dvc/remote/oss.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import os import threading diff --git a/dvc/remote/s3.py b/dvc/remote/s3.py index 6366fc426..5693f97c0 100644 --- a/dvc/remote/s3.py +++ b/dvc/remote/s3.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals import logging import os diff --git a/dvc/remote/ssh/__init__.py b/dvc/remote/ssh/__init__.py index 78da815e1..710525710 100644 --- a/dvc/remote/ssh/__init__.py +++ b/dvc/remote/ssh/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno import getpass import io diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index 62efa14e7..8141d3e55 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os from contextlib import contextmanager diff --git a/dvc/repo/add.py b/dvc/repo/add.py index a94f0ef1a..d080d200f 100644 --- a/dvc/repo/add.py +++ b/dvc/repo/add.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os diff --git a/dvc/repo/checkout.py b/dvc/repo/checkout.py index c0c6e4417..820184b07 100644 --- a/dvc/repo/checkout.py +++ b/dvc/repo/checkout.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from dvc.exceptions import CheckoutError diff --git a/dvc/repo/diff.py b/dvc/repo/diff.py index b9c35f2a8..f4737da72 100644 --- a/dvc/repo/diff.py +++ b/dvc/repo/diff.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from errno import ENOENT diff --git a/dvc/repo/fetch.py b/dvc/repo/fetch.py index 531fd4d53..8b621469b 100644 --- a/dvc/repo/fetch.py +++ b/dvc/repo/fetch.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from dvc.cache import NamedCache diff --git a/dvc/repo/gc.py b/dvc/repo/gc.py index 85d681b08..929d0acfd 100644 --- a/dvc/repo/gc.py +++ b/dvc/repo/gc.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from . import locked diff --git a/dvc/repo/graph.py b/dvc/repo/graph.py index 0d486f8fa..fab001a48 100644 --- a/dvc/repo/graph.py +++ b/dvc/repo/graph.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - def check_acyclic(graph): import networkx as nx from dvc.exceptions import CyclicGraphError diff --git a/dvc/repo/metrics/modify.py b/dvc/repo/metrics/modify.py index 4ddf18248..acb547674 100644 --- a/dvc/repo/metrics/modify.py +++ b/dvc/repo/metrics/modify.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.exceptions import DvcException from dvc.repo import locked diff --git a/dvc/repo/metrics/show.py b/dvc/repo/metrics/show.py index a2a12babc..f9e9a36bc 100644 --- a/dvc/repo/metrics/show.py +++ b/dvc/repo/metrics/show.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import csv import errno import json diff --git a/dvc/repo/pull.py b/dvc/repo/pull.py index 822897e29..fadd34d3d 100644 --- a/dvc/repo/pull.py +++ b/dvc/repo/pull.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from dvc.repo import locked diff --git a/dvc/repo/push.py b/dvc/repo/push.py index 7d3593f54..4ea1dd0b3 100644 --- a/dvc/repo/push.py +++ b/dvc/repo/push.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from . import locked diff --git a/dvc/repo/reproduce.py b/dvc/repo/reproduce.py index aad74b37b..67e2f3233 100644 --- a/dvc/repo/reproduce.py +++ b/dvc/repo/reproduce.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from dvc.exceptions import ReproductionError diff --git a/dvc/repo/run.py b/dvc/repo/run.py index 2c590716f..e5d62ec87 100644 --- a/dvc/repo/run.py +++ b/dvc/repo/run.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from . import locked from .scm_context import scm_context diff --git a/dvc/repo/status.py b/dvc/repo/status.py index 6bb7dee52..c5ec38db6 100644 --- a/dvc/repo/status.py +++ b/dvc/repo/status.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from funcy.py3 import cat diff --git a/dvc/rwlock.py b/dvc/rwlock.py index 29b7bce88..b05d255db 100644 --- a/dvc/rwlock.py +++ b/dvc/rwlock.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import json diff --git a/dvc/scheme.py b/dvc/scheme.py index 5f7a8d1a2..e64e24f5a 100644 --- a/dvc/scheme.py +++ b/dvc/scheme.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - class Schemes: SSH = "ssh" HDFS = "hdfs" diff --git a/dvc/scm/__init__.py b/dvc/scm/__init__.py index ba6236bc6..73d89fbd1 100644 --- a/dvc/scm/__init__.py +++ b/dvc/scm/__init__.py @@ -1,5 +1,4 @@ """Manages source control systems(e.g. Git).""" -from __future__ import unicode_literals from dvc.scm.base import Base from dvc.scm.git import Git diff --git a/dvc/scm/base.py b/dvc/scm/base.py index 499c70379..7ff877ae9 100644 --- a/dvc/scm/base.py +++ b/dvc/scm/base.py @@ -1,5 +1,4 @@ """Manages source control systems(e.g. Git) in dvc.""" -from __future__ import unicode_literals import os diff --git a/dvc/scm/git/__init__.py b/dvc/scm/git/__init__.py index 668dc6fd5..a61c1ee37 100644 --- a/dvc/scm/git/__init__.py +++ b/dvc/scm/git/__init__.py @@ -1,5 +1,4 @@ """Manages Git.""" -from __future__ import unicode_literals import logging import os diff --git a/dvc/stage.py b/dvc/stage.py index bb0ed8c4c..d89699d4e 100644 --- a/dvc/stage.py +++ b/dvc/stage.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from dvc.utils.compat import pathlib, str import logging import os diff --git a/dvc/state.py b/dvc/state.py index 5f10654d1..a21b76266 100644 --- a/dvc/state.py +++ b/dvc/state.py @@ -1,5 +1,4 @@ """Manages state database used for checksum caching.""" -from __future__ import unicode_literals import logging import os diff --git a/dvc/system.py b/dvc/system.py index 219500833..3723094b7 100644 --- a/dvc/system.py +++ b/dvc/system.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno import logging import os diff --git a/dvc/updater.py b/dvc/updater.py index 4c83084a6..cfa416ffa 100644 --- a/dvc/updater.py +++ b/dvc/updater.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os import sys diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index b8db58e1a..b157adc53 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -1,5 +1,4 @@ """Helpers for other modules.""" -from __future__ import unicode_literals import hashlib import json diff --git a/dvc/utils/collections.py b/dvc/utils/collections.py index e20ee6f1e..03ee4c81e 100644 --- a/dvc/utils/collections.py +++ b/dvc/utils/collections.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from dvc.utils.compat import Mapping diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py index a4819fccc..70e9c360e 100644 --- a/dvc/utils/compat.py +++ b/dvc/utils/compat.py @@ -1,5 +1,4 @@ """Handle import compatibility between Python 2 and Python 3""" -from __future__ import absolute_import import errno import os diff --git a/dvc/utils/fs.py b/dvc/utils/fs.py index 4f1a8013a..dd27e031e 100644 --- a/dvc/utils/fs.py +++ b/dvc/utils/fs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno import logging import os diff --git a/setup.py b/setup.py index b05520433..c355b3bc2 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,6 @@ install_requires = [ "python-dateutil<2.8.1,>=2.1", # Consolidates azure-blob-storage and boto3 "ply>=3.9", # See https://github.com/pyinstaller/pyinstaller/issues/1945 "configparser>=3.5.0", - "future>=0.16.0", "colorama>=0.3.9", "configobj>=5.0.6", "gitpython>=2.1.8", diff --git a/tests/basic_env.py b/tests/basic_env.py index 1fba67a55..380524f92 100644 --- a/tests/basic_env.py +++ b/tests/basic_env.py @@ -1,5 +1,4 @@ # encoding: utf-8 -from __future__ import unicode_literals import logging import os diff --git a/tests/conftest.py b/tests/conftest.py index 116910d92..277477a90 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import mockssh diff --git a/tests/dir_helpers.py b/tests/dir_helpers.py index 4487e79b4..682062871 100644 --- a/tests/dir_helpers.py +++ b/tests/dir_helpers.py @@ -42,7 +42,6 @@ from global repo template to creating everything inplace, which: - allows using telling filenames, e.g. "git_tracked_file" instead of "foo" - does not create unnecessary files """ -from __future__ import unicode_literals import os import pytest diff --git a/tests/func/test_add.py b/tests/func/test_add.py index 3c3b21519..ba6b9def5 100644 --- a/tests/func/test_add.py +++ b/tests/func/test_add.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import logging import os diff --git a/tests/func/test_commit.py b/tests/func/test_commit.py index 8d6a8e57d..51b595d16 100644 --- a/tests/func/test_commit.py +++ b/tests/func/test_commit.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pytest from dvc.stage import StageCommitError diff --git a/tests/func/test_dependency.py b/tests/func/test_dependency.py index 941960ef6..8d591e9ed 100644 --- a/tests/func/test_dependency.py +++ b/tests/func/test_dependency.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import pytest diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index 72b425c6e..dd9be725d 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import dvc.repo.diff as diff diff --git a/tests/func/test_gc.py b/tests/func/test_gc.py index 7d06cb9a3..fea5b8d27 100644 --- a/tests/func/test_gc.py +++ b/tests/func/test_gc.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import configobj diff --git a/tests/func/test_get.py b/tests/func/test_get.py index 518238844..4236c4409 100644 --- a/tests/func/test_get.py +++ b/tests/func/test_get.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os diff --git a/tests/func/test_get_url.py b/tests/func/test_get_url.py index 39cb0ec44..3657dd713 100644 --- a/tests/func/test_get_url.py +++ b/tests/func/test_get_url.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import os diff --git a/tests/func/test_ignore.py b/tests/func/test_ignore.py index c581cfd74..3074ef05c 100644 --- a/tests/func/test_ignore.py +++ b/tests/func/test_ignore.py @@ -1,5 +1,4 @@ # encoding: utf-8 -from __future__ import unicode_literals import os import shutil import pytest diff --git a/tests/func/test_import.py b/tests/func/test_import.py index 6af8afb16..99da2df89 100644 --- a/tests/func/test_import.py +++ b/tests/func/test_import.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import os import shutil diff --git a/tests/func/test_import_url.py b/tests/func/test_import_url.py index 6f8fa47b4..9522639c4 100644 --- a/tests/func/test_import_url.py +++ b/tests/func/test_import_url.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import os from uuid import uuid4 diff --git a/tests/func/test_metrics.py b/tests/func/test_metrics.py index c92ad9b81..dcd0a477c 100644 --- a/tests/func/test_metrics.py +++ b/tests/func/test_metrics.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals import json import logging diff --git a/tests/func/test_repro.py b/tests/func/test_repro.py index 406bbd8fc..00ea003aa 100644 --- a/tests/func/test_repro.py +++ b/tests/func/test_repro.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import getpass import os diff --git a/tests/func/test_scm.py b/tests/func/test_scm.py index 3c3c8e84b..23eea236b 100644 --- a/tests/func/test_scm.py +++ b/tests/func/test_scm.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from git import Repo diff --git a/tests/func/test_tree.py b/tests/func/test_tree.py index ee38be6ae..ef4412e8c 100644 --- a/tests/func/test_tree.py +++ b/tests/func/test_tree.py @@ -1,5 +1,4 @@ # encoding: utf-8 -from __future__ import unicode_literals from os.path import join diff --git a/tests/unit/remote/ssh/test_connection.py b/tests/unit/remote/ssh/test_connection.py index bda20b0e7..2b329b424 100644 --- a/tests/unit/remote/ssh/test_connection.py +++ b/tests/unit/remote/ssh/test_connection.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import filecmp import os import platform diff --git a/tests/unit/test_logger.py b/tests/unit/test_logger.py index dbbabb10c..a671b2112 100644 --- a/tests/unit/test_logger.py +++ b/tests/unit/test_logger.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import traceback diff --git a/tests/unit/test_rwlock.py b/tests/unit/test_rwlock.py index 9e554960e..410624404 100644 --- a/tests/unit/test_rwlock.py +++ b/tests/unit/test_rwlock.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import pytest diff --git a/tests/unit/utils/test_http.py b/tests/unit/utils/test_http.py index 38bb41a49..37618be67 100644 --- a/tests/unit/utils/test_http.py +++ b/tests/unit/utils/test_http.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import io import requests