diff --git a/dvc/command/add.py b/dvc/command/add.py index 5fcaa9560..813a497eb 100644 --- a/dvc/command/add.py +++ b/dvc/command/add.py @@ -1,5 +1,5 @@ from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdAdd(CmdBase): diff --git a/dvc/command/common/base.py b/dvc/command/base.py similarity index 100% rename from dvc/command/common/base.py rename to dvc/command/base.py diff --git a/dvc/command/checkout.py b/dvc/command/checkout.py index 32f77c178..50e519f9a 100644 --- a/dvc/command/checkout.py +++ b/dvc/command/checkout.py @@ -1,5 +1,5 @@ import os -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdCheckout(CmdBase): diff --git a/dvc/command/common/__init__.py b/dvc/command/common/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/dvc/command/common/common_error.py b/dvc/command/common/common_error.py deleted file mode 100644 index 3013a73bb..000000000 --- a/dvc/command/common/common_error.py +++ /dev/null @@ -1,6 +0,0 @@ -from dvc.exceptions import DvcException - - -class CmdCommonError(DvcException): - def __init__(self, msg): - super(CmdCommonError, self).__init__('{}'.format(msg)) diff --git a/dvc/command/config.py b/dvc/command/config.py index c49d81f68..731ba5c8a 100644 --- a/dvc/command/config.py +++ b/dvc/command/config.py @@ -1,7 +1,7 @@ import os import configobj -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase from dvc.logger import Logger from dvc.config import Config diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py index 3db3d16d4..f3606630f 100644 --- a/dvc/command/data_sync.py +++ b/dvc/command/data_sync.py @@ -1,4 +1,4 @@ -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdDataBase(CmdBase): diff --git a/dvc/command/destroy.py b/dvc/command/destroy.py index 5308239bc..5619f022b 100644 --- a/dvc/command/destroy.py +++ b/dvc/command/destroy.py @@ -1,4 +1,4 @@ -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase from dvc.prompt import prompt diff --git a/dvc/command/gc.py b/dvc/command/gc.py index 19c4c0036..2bd9fcaff 100644 --- a/dvc/command/gc.py +++ b/dvc/command/gc.py @@ -1,4 +1,4 @@ -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdGC(CmdBase): diff --git a/dvc/command/imp.py b/dvc/command/imp.py index abe497838..8ed3c0950 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -1,5 +1,5 @@ from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdImport(CmdBase): diff --git a/dvc/command/install.py b/dvc/command/install.py index d91ee6cd5..55d6341de 100644 --- a/dvc/command/install.py +++ b/dvc/command/install.py @@ -1,5 +1,5 @@ from dvc.logger import Logger -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdInstall(CmdBase): diff --git a/dvc/command/lock.py b/dvc/command/lock.py index 6e0d5850a..24a1c42cf 100644 --- a/dvc/command/lock.py +++ b/dvc/command/lock.py @@ -1,5 +1,5 @@ from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdLockBase(CmdBase): diff --git a/dvc/command/metrics.py b/dvc/command/metrics.py index 8d3e746f7..7014826c6 100644 --- a/dvc/command/metrics.py +++ b/dvc/command/metrics.py @@ -1,4 +1,4 @@ -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase from dvc.exceptions import DvcException diff --git a/dvc/command/move.py b/dvc/command/move.py index bef31165b..7f2ac6fb7 100644 --- a/dvc/command/move.py +++ b/dvc/command/move.py @@ -1,5 +1,5 @@ from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdMove(CmdBase): diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index 5a7a7237c..8098d0be4 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -1,7 +1,7 @@ import os from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdPipelineShow(CmdBase): diff --git a/dvc/command/remove.py b/dvc/command/remove.py index e241fe32e..3fa0260c2 100644 --- a/dvc/command/remove.py +++ b/dvc/command/remove.py @@ -1,5 +1,5 @@ from dvc.exceptions import DvcException -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdRemove(CmdBase): diff --git a/dvc/command/repro.py b/dvc/command/repro.py index e6c07658f..433702ff8 100644 --- a/dvc/command/repro.py +++ b/dvc/command/repro.py @@ -1,6 +1,6 @@ import os -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdRepro(CmdBase): diff --git a/dvc/command/root.py b/dvc/command/root.py index 99890da4f..8d83f5c89 100644 --- a/dvc/command/root.py +++ b/dvc/command/root.py @@ -1,6 +1,6 @@ import os -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase class CmdRoot(CmdBase): diff --git a/dvc/command/run.py b/dvc/command/run.py index 95d7a636d..b279e47ce 100644 --- a/dvc/command/run.py +++ b/dvc/command/run.py @@ -1,6 +1,6 @@ import os -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase from dvc.logger import Logger from dvc.exceptions import DvcException diff --git a/dvc/main.py b/dvc/main.py index 1f708d00f..1ebc3e625 100644 --- a/dvc/main.py +++ b/dvc/main.py @@ -1,6 +1,6 @@ from dvc.logger import Logger from dvc.cli import parse_args -from dvc.command.common.base import CmdBase +from dvc.command.base import CmdBase def main(argv=None):