From 68d965f4fba00d22a1752476c2908e342a4ec21a Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Mon, 7 Jan 2019 18:20:56 +0200 Subject: [PATCH] RFC: utils: create a separate module Signed-off-by: Ruslan Kuprieiev --- dvc/command/imp.py | 2 +- dvc/dependency/__init__.py | 2 +- dvc/dependency/http.py | 2 +- dvc/output/__init__.py | 2 +- dvc/output/hdfs.py | 2 +- dvc/output/local.py | 2 +- dvc/output/s3.py | 2 +- dvc/output/ssh.py | 2 +- dvc/remote/azure.py | 2 +- dvc/remote/gs.py | 2 +- dvc/remote/s3.py | 2 +- dvc/{utils.py => utils/__init__.py} | 5 ----- dvc/utils/compat.py | 6 ++++++ tests/test_repro.py | 6 +----- 14 files changed, 18 insertions(+), 21 deletions(-) rename dvc/{utils.py => utils/__init__.py} (96%) create mode 100644 dvc/utils/compat.py diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 0b42922f7..77390b620 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -1,7 +1,7 @@ import os import dvc.logger as logger -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.exceptions import DvcException from dvc.command.base import CmdBase diff --git a/dvc/dependency/__init__.py b/dvc/dependency/__init__.py index 800316400..929e7e8a0 100644 --- a/dvc/dependency/__init__.py +++ b/dvc/dependency/__init__.py @@ -1,7 +1,7 @@ import schema from dvc.config import Config -from dvc.utils import urlparse +from dvc.utils.compat import urlparse import dvc.output as output from dvc.output.base import OutputBase diff --git a/dvc/dependency/http.py b/dvc/dependency/http.py index 1a663b2c7..562e690c0 100644 --- a/dvc/dependency/http.py +++ b/dvc/dependency/http.py @@ -1,4 +1,4 @@ -from dvc.utils import urlparse, urljoin +from dvc.utils.compat import urlparse, urljoin from dvc.output.base import OutputBase from dvc.remote.http import RemoteHTTP from dvc.dependency.base import DependencyBase diff --git a/dvc/output/__init__.py b/dvc/output/__init__.py index 6def97fca..0bf820ee8 100644 --- a/dvc/output/__init__.py +++ b/dvc/output/__init__.py @@ -1,7 +1,7 @@ import schema from dvc.config import Config -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.output.base import OutputBase from dvc.output.s3 import OutputS3 diff --git a/dvc/output/hdfs.py b/dvc/output/hdfs.py index 725a181c0..4759f4e82 100644 --- a/dvc/output/hdfs.py +++ b/dvc/output/hdfs.py @@ -1,6 +1,6 @@ import posixpath -from dvc.utils import urlparse +from dvc.utils.compat import urlparse 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 cab178871..4e1f8d3ff 100644 --- a/dvc/output/local.py +++ b/dvc/output/local.py @@ -1,7 +1,7 @@ import os import dvc.logger as logger -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.istextfile import istextfile from dvc.exceptions import DvcException from dvc.remote.local import RemoteLOCAL diff --git a/dvc/output/s3.py b/dvc/output/s3.py index 41cc31ed3..7c46e11e3 100644 --- a/dvc/output/s3.py +++ b/dvc/output/s3.py @@ -1,7 +1,7 @@ import posixpath -from dvc.utils import urlparse from dvc.remote.s3 import RemoteS3 +from dvc.utils.compat import urlparse from dvc.output.base import OutputBase diff --git a/dvc/output/ssh.py b/dvc/output/ssh.py index 53d10daee..f26a48bed 100644 --- a/dvc/output/ssh.py +++ b/dvc/output/ssh.py @@ -1,6 +1,6 @@ import posixpath -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.output.base import OutputBase from dvc.remote.ssh import RemoteSSH diff --git a/dvc/remote/azure.py b/dvc/remote/azure.py index 01e71e4cc..abb9d5c13 100644 --- a/dvc/remote/azure.py +++ b/dvc/remote/azure.py @@ -8,7 +8,7 @@ except ImportError: BlockBlobService = None import dvc.logger as logger -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.progress import progress from dvc.config import Config from dvc.remote.base import RemoteBase diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index 65b9e71d6..8530f36b2 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -6,7 +6,7 @@ except ImportError: storage = None import dvc.logger as logger -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.remote.base import RemoteBase from dvc.config import Config from dvc.progress import progress diff --git a/dvc/remote/s3.py b/dvc/remote/s3.py index 9bff1ebc6..420985520 100644 --- a/dvc/remote/s3.py +++ b/dvc/remote/s3.py @@ -7,7 +7,7 @@ except ImportError: boto3 = None import dvc.logger as logger -from dvc.utils import urlparse +from dvc.utils.compat import urlparse from dvc.progress import progress from dvc.config import Config from dvc.remote.base import RemoteBase diff --git a/dvc/utils.py b/dvc/utils/__init__.py similarity index 96% rename from dvc/utils.py rename to dvc/utils/__init__.py index 17884237e..120fff3ef 100644 --- a/dvc/utils.py +++ b/dvc/utils/__init__.py @@ -9,11 +9,6 @@ import json import shutil import hashlib -try: - from urlparse import urlparse, urljoin # noqa: F401 -except ImportError: - from urllib.parse import urlparse, urljoin # noqa: F401 - import dvc.logger as logger from dvc.progress import progress from dvc.istextfile import istextfile diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py new file mode 100644 index 000000000..c075ae306 --- /dev/null +++ b/dvc/utils/compat.py @@ -0,0 +1,6 @@ +"""Handle impor compatibility between Python 2 and Python 3""" + +try: + from urlparse import urlparse, urljoin # noqa: F401 +except ImportError: + from urllib.parse import urlparse, urljoin # noqa: F401 diff --git a/tests/test_repro.py b/tests/test_repro.py index 6d91e060d..a943657e2 100644 --- a/tests/test_repro.py +++ b/tests/test_repro.py @@ -6,11 +6,6 @@ import getpass import posixpath from subprocess import Popen, PIPE -try: - from urlparse import urljoin -except ImportError: - from urllib.parse import urljoin - import boto3 import uuid from google.cloud import storage as gc @@ -18,6 +13,7 @@ from google.cloud import storage as gc from dvc.main import main from dvc.project import Project, ReproductionError from dvc.utils import file_md5 +from dvc.utils.compat import urljoin from dvc.remote.local import RemoteLOCAL from dvc.stage import Stage, StageFileDoesNotExistError from dvc.system import System