From bf2fb8692bc0546daa6c942d59e630d7c62a3192 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Fri, 19 Apr 2019 14:12:48 +0200
Subject: [PATCH] cli: rename cli/deposit.py as cli/client.py to prevent a name
clash
in the swh.deposit.cli namespace.
---
swh/deposit/cli/__init__.py | 2 +-
swh/deposit/cli/admin.py | 4 ++--
swh/deposit/cli/{deposit.py => client.py} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename swh/deposit/cli/{deposit.py => client.py} (100%)
diff --git a/swh/deposit/cli/__init__.py b/swh/deposit/cli/__init__.py
index 5a209626..f07c4060 100644
--- a/swh/deposit/cli/__init__.py
+++ b/swh/deposit/cli/__init__.py
@@ -24,7 +24,7 @@ def cli(ctx, log_level):
def main():
logging.basicConfig()
- from . import deposit # noqa
+ from . import client # noqa
try:
from . import admin # noqa
except ImportError: # server part is optional
diff --git a/swh/deposit/cli/admin.py b/swh/deposit/cli/admin.py
index 9b918335..53aab62d 100644
--- a/swh/deposit/cli/admin.py
+++ b/swh/deposit/cli/admin.py
@@ -6,10 +6,10 @@
import click
from swh.deposit.config import setup_django_for
-from swh.deposit.cli import cli
+from swh.deposit.cli import deposit
-@cli.group('admin')
+@deposit.group('admin')
@click.option('--config-file', '-C', default=None,
type=click.Path(exists=True, dir_okay=False,),
help="Optional extra configuration file.")
diff --git a/swh/deposit/cli/deposit.py b/swh/deposit/cli/client.py
similarity index 100%
rename from swh/deposit/cli/deposit.py
rename to swh/deposit/cli/client.py
--
GitLab