diff --git a/dvc/external_repo.py b/dvc/external_repo.py index b57f5cd80..4081ee25f 100644 --- a/dvc/external_repo.py +++ b/dvc/external_repo.py @@ -4,8 +4,8 @@ import os import tempfile from distutils.dir_util import copy_tree -from funcy import retry from contextlib import contextmanager +from funcy import retry from dvc.utils import remove diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 625a5a233..ca95a4e19 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -1,17 +1,17 @@ from __future__ import unicode_literals -from dvc.ignore import DvcIgnore -from dvc.utils.compat import str, basestring, urlparse, FileNotFoundError - +from operator import itemgetter +from multiprocessing import cpu_count import json import logging import tempfile import itertools -from operator import itemgetter -from multiprocessing import cpu_count from functools import partial from concurrent.futures import ThreadPoolExecutor from copy import copy + +from dvc.ignore import DvcIgnore +from dvc.utils.compat import str, basestring, urlparse, FileNotFoundError from dvc.remote.slow_link_detection import slow_link_guard import dvc.prompt as prompt @@ -27,16 +27,13 @@ from dvc.state import StateNoop from dvc.path_info import PathInfo, URLInfo from dvc.utils.http import open_url - logger = logging.getLogger(__name__) - STATUS_OK = 1 STATUS_MISSING = 2 STATUS_NEW = 3 STATUS_DELETED = 4 - STATUS_MAP = { # (local_exists, remote_exists) (True, True): STATUS_OK, diff --git a/dvc/remote/http.py b/dvc/remote/http.py index 5ff067e09..07636f017 100644 --- a/dvc/remote/http.py +++ b/dvc/remote/http.py @@ -1,10 +1,9 @@ from __future__ import unicode_literals +import logging from dvc.scheme import Schemes from dvc.utils.compat import open -import logging - from dvc.progress import Tqdm from dvc.exceptions import DvcException from dvc.config import Config, ConfigError