Data item file renaming

dvc/cmd_base.py

@@ -4,7 +4,7 @@ import os
 from dvc.git_wrapper import GitWrapper
 from dvc.config import Config, ConfigError
 from dvc.logger import Logger
-from dvc.path.path_factory import PathFactory
+from dvc.path.factory import PathFactory
 from dvc.utils import cached_property
 
 

dvc/cmd_repro.py

@@ -6,7 +6,7 @@ from dvc.cmd_base import CmdBase
 from dvc.cmd_run import CmdRun
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
-from dvc.path.data_path import NotInDataDirError
+from dvc.path.data_item import NotInDataDirError
 from dvc.state_file import StateFile
 from dvc.utils import run
 

dvc/cmd_run.py

@@ -2,7 +2,7 @@ import os
 import shutil
 import fasteners
 
-from dvc.path.data_path import NotInDataDirError
+from dvc.path.data_item import NotInDataDirError
 from dvc.git_wrapper import GitWrapper
 from dvc.cmd_base import CmdBase
 from dvc.logger import Logger

dvc/git_wrapper.py

@@ -2,7 +2,6 @@ import os
 import sys
 import subprocess
 
-from dvc.path.dvc_path import DvcPath
 from dvc.exceptions import DvcException
 from dvc.logger import Logger
 from dvc.config import Config

dvc/path/data_item.py

@@ -1,6 +1,6 @@
 import os
 
-from dvc.path.dvc_path import DvcPath
+from dvc.path.path import DvcPath
 from dvc.exceptions import DvcException
 from dvc.utils import cached_property
 

dvc/path/factory.py

@@ -1,7 +1,7 @@
 import os
 
-from dvc.path.data_path import DataPath, DataFilePathError, NotInDataDirError
-from dvc.path.dvc_path import DvcPath
+from dvc.path.data_item import DataPath, DataFilePathError, NotInDataDirError
+from dvc.path.path import DvcPath
 
 
 class PathFactory(object):

tests/basic_env.py

@@ -4,8 +4,8 @@ from unittest import TestCase
 
 from dvc.config import ConfigI
 from dvc.git_wrapper import GitWrapperI, GitWrapper
-from dvc.path.data_path import DataPath
-from dvc.path.path_factory import PathFactory
+from dvc.path.data_item import DataPath
+from dvc.path.factory import PathFactory
 
 
 class BasicEnvironment(TestCase):

tests/test_cmd_data_remove.py

@@ -1,7 +1,7 @@
 import os
 
 from dvc.cmd_data_remove import CmdDataRemove, DataRemoveError
-from dvc.path.data_path import DataFilePathError
+from dvc.path.data_item import DataFilePathError
 from tests.basic_env import DirHierarchyEnvironment
 
 

tests/test_data_file_obj.py

@@ -2,8 +2,8 @@ import os
 
 from dvc.config import ConfigI
 from dvc.git_wrapper import GitWrapperI
-from dvc.path.data_path import NotInDataDirError, DataFilePathError, DataPath
-from dvc.path.path_factory import PathFactory
+from dvc.path.data_item import NotInDataDirError, DataFilePathError, DataPath
+from dvc.path.factory import PathFactory
 from tests.basic_env import BasicEnvironment
 
 

tests/test_dvc_path.py

@@ -2,7 +2,7 @@ import os
 import shutil
 from unittest import TestCase
 
-from dvc.path.dvc_path import DvcPath
+from dvc.path.path import DvcPath
 from dvc.git_wrapper import GitWrapperI