diff --git a/dvc/istextfile.py b/dvc/objects/istextfile.py similarity index 100% rename from dvc/istextfile.py rename to dvc/objects/istextfile.py diff --git a/dvc/output.py b/dvc/output.py index 1fe0a22b0..dfe1dff82 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -16,6 +16,7 @@ from dvc.exceptions import ( RemoteCacheRequiredError, ) from dvc.objects.hash_info import HashInfo +from dvc.objects.istextfile import istextfile from dvc.objects.meta import Meta from .data import check as ocheck @@ -29,7 +30,6 @@ from .fs.base import RemoteMissingDepsError from .fs.hdfs import HDFSFileSystem from .fs.local import LocalFileSystem from .fs.s3 import S3FileSystem -from .istextfile import istextfile from .objects.errors import ObjectFormatError from .scheme import Schemes from .utils import relpath diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index f50df9a4e..253dba68e 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -43,7 +43,7 @@ def _fobj_md5(fobj, hash_md5, binary, progress_func=None): def file_md5(fname, fs): """get the (md5 hexdigest, md5 digest) of a file""" - from dvc.istextfile import istextfile + from dvc.objects.istextfile import istextfile from dvc.progress import Tqdm hash_md5 = hashlib.md5() diff --git a/dvc/utils/stream.py b/dvc/utils/stream.py index 075569a6f..af5d68b1c 100644 --- a/dvc/utils/stream.py +++ b/dvc/utils/stream.py @@ -3,8 +3,8 @@ import io from funcy import cached_property -from dvc.istextfile import DEFAULT_CHUNK_SIZE, istextblock from dvc.objects.hash_info import HashInfo +from dvc.objects.istextfile import DEFAULT_CHUNK_SIZE, istextblock from dvc.utils import dos2unix diff --git a/tests/unit/utils/test_stream.py b/tests/unit/utils/test_stream.py index 2a80c3f0d..cb9877f19 100644 --- a/tests/unit/utils/test_stream.py +++ b/tests/unit/utils/test_stream.py @@ -1,7 +1,7 @@ import pytest from dvc.fs.local import LocalFileSystem -from dvc.istextfile import DEFAULT_CHUNK_SIZE, istextfile +from dvc.objects.istextfile import DEFAULT_CHUNK_SIZE, istextfile from dvc.utils import file_md5 from dvc.utils.stream import HashedStreamReader