mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-22 07:18:28 +01:00
RFC: utils: create a separate module
Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
+1
-5
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user