From 4b2ab0488a68b5b0b26551aea9c6b4a136e904e2 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Wed, 28 Aug 2019 15:06:28 +0200
Subject: [PATCH] cli: Unify new_lister method name to get_lister

---
 swh/lister/cli.py            |  6 +++---
 swh/lister/tests/test_cli.py | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/swh/lister/cli.py b/swh/lister/cli.py
index f5c2a1b..2445140 100644
--- a/swh/lister/cli.py
+++ b/swh/lister/cli.py
@@ -26,7 +26,7 @@ DEFAULT_BASEURLS = {
 }
 
 
-def new_lister(lister_name, db_url, drop_tables=False, **conf):
+def get_lister(lister_name, db_url, drop_tables=False, **conf):
     """Instantiate a lister given its name.
 
     Args:
@@ -189,7 +189,7 @@ def cli(ctx, db_url, listers, drop_tables):
     for lister_name in listers:
         logger.info('Initializing lister %s', lister_name)
         lister, drop_schema_fn, init_schema_fn, insert_minimum_data_fn = \
-            new_lister(lister_name, db_url, drop_tables=drop_tables)
+            get_lister(lister_name, db_url, drop_tables=drop_tables)
 
         if drop_schema_fn:
             drop_schema_fn(lister_name, lister)
@@ -229,7 +229,7 @@ def run(ctx, db_url, lister, priority, options):
         **kwargs,
     }
 
-    lister, _, _, _ = new_lister(lister, db_url, **override_config)
+    lister, _, _, _ = get_lister(lister, db_url, **override_config)
     lister.run()
 
 
diff --git a/swh/lister/tests/test_cli.py b/swh/lister/tests/test_cli.py
index d0b9c50..57ea7a3 100644
--- a/swh/lister/tests/test_cli.py
+++ b/swh/lister/tests/test_cli.py
@@ -6,20 +6,20 @@
 import pytest
 
 from swh.lister.core.lister_base import ListerBase
-from swh.lister.cli import new_lister, SUPPORTED_LISTERS, DEFAULT_BASEURLS
+from swh.lister.cli import get_lister, SUPPORTED_LISTERS, DEFAULT_BASEURLS
 
 from .test_utils import init_db
 
 
-def test_new_lister_wrong_input():
+def test_get_lister_wrong_input():
     """Unsupported lister should raise"""
     with pytest.raises(ValueError) as e:
-        new_lister('unknown', 'db-url')
+        get_lister('unknown', 'db-url')
 
     assert "Invalid lister" in str(e.value)
 
 
-def test_new_lister():
+def test_get_lister():
     """Instantiating a supported lister should be ok
 
     """
@@ -27,7 +27,7 @@ def test_new_lister():
     supported_listers_with_init = {'npm', 'debian'}
     supported_listers = set(SUPPORTED_LISTERS) - supported_listers_with_init
     for lister_name in supported_listers:
-        lst, drop_fn, init_fn, insert_data_fn = new_lister(lister_name, db_url)
+        lst, drop_fn, init_fn, insert_data_fn = get_lister(lister_name, db_url)
 
         assert isinstance(lst, ListerBase)
         assert drop_fn is None
@@ -35,7 +35,7 @@ def test_new_lister():
         assert insert_data_fn is None
 
     for lister_name in supported_listers_with_init:
-        lst, drop_fn, init_fn, insert_data_fn = new_lister(lister_name, db_url)
+        lst, drop_fn, init_fn, insert_data_fn = get_lister(lister_name, db_url)
 
         assert isinstance(lst, ListerBase)
         assert drop_fn is None
@@ -43,7 +43,7 @@ def test_new_lister():
         assert insert_data_fn is not None
 
     for lister_name in supported_listers_with_init:
-        lst, drop_fn, init_fn, insert_data_fn = new_lister(lister_name, db_url,
+        lst, drop_fn, init_fn, insert_data_fn = get_lister(lister_name, db_url,
                                                            drop_tables=True)
 
         assert isinstance(lst, ListerBase)
@@ -52,7 +52,7 @@ def test_new_lister():
         assert insert_data_fn is not None
 
 
-def test_new_lister_override():
+def test_get_lister_override():
     """Overriding the lister configuration should populate its config
 
     """
@@ -66,7 +66,7 @@ def test_new_lister_override():
 
     # check the override ends up defined in the lister
     for lister_name, (url_key, url_value) in listers.items():
-        lst, drop_fn, init_fn, insert_data_fn = new_lister(
+        lst, drop_fn, init_fn, insert_data_fn = get_lister(
             lister_name, db_url, **{
                 'api_baseurl': url_value,
                 'priority': 'high',
@@ -80,7 +80,7 @@ def test_new_lister_override():
     # check the default urls are used and not the override (since it's not
     # passed)
     for lister_name, (url_key, url_value) in listers.items():
-        lst, drop_fn, init_fn, insert_data_fn = new_lister(lister_name, db_url)
+        lst, drop_fn, init_fn, insert_data_fn = get_lister(lister_name, db_url)
 
         # no override so this does not end up in lister's configuration
         assert url_key not in lst.config