refactor: remove unused "merge" parameter

biothings · Jun 15, 2023 · 1c4e59d · 1c4e59d
1 parent 092be76
commit 1c4e59d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/biothings/management/dataplugin.py b/biothings/management/dataplugin.py
@@ -144,14 +144,14 @@ def inspect_source(
             """,
         ),
     ] = None,
-    merge: Annotated[
-        Optional[bool],
-        typer.Option(
-            "--merge",
-            "-m",
-            help="""Merge scalar into list when both exist (eg. {"val":..} and [{"val":...}])""",
-        ),
-    ] = False,
+    # merge: Annotated[
+    #     Optional[bool],
+    #     typer.Option(
+    #         "--merge",
+    #         "-m",
+    #         help="""Merge scalar into list when both exist (eg. {"val":..} and [{"val":...}])""",
+    #     ),
+    # ] = False,
     output: Annotated[
         Optional[str],
         typer.Option(
@@ -166,7 +166,7 @@ def inspect_source(
         sub_source_name=sub_source_name,
         mode=mode,
         limit=limit,
-        merge=merge,
+        merge=False,
         output=output,
         logger=logger,
     )

diff --git a/biothings/management/dataplugin_localhub.py b/biothings/management/dataplugin_localhub.py
@@ -160,14 +160,14 @@ def inspect_source(
             """,
         ),
     ] = None,
-    merge: Annotated[
-        Optional[bool],
-        typer.Option(
-            "--merge",
-            "-m",
-            help="""Merge scalar into list when both exist (eg. {"val":..} and [{"val":...}])""",
-        ),
-    ] = False,
+    # merge: Annotated[
+    #     Optional[bool],
+    #     typer.Option(
+    #         "--merge",
+    #         "-m",
+    #         help="""Merge scalar into list when both exist (eg. {"val":..} and [{"val":...}])""",
+    #     ),
+    # ] = False,
     output: Annotated[
         Optional[str],
         typer.Option(
@@ -182,7 +182,7 @@ def inspect_source(
         sub_source_name=sub_source_name,
         mode=mode,
         limit=limit,
-        merge=merge,
+        merge=False,
         output=output,
         logger=logger,
     )

diff --git a/biothings/utils/inspect.py b/biothings/utils/inspect.py
@@ -405,11 +405,9 @@ def merge_scalar_list(mapt, mode):
                     pass
         # explore further
         merge_scalar_list(mapt[list], mode)
-    # elif type(mapt) == dict:   # TODO: remove this line
     elif isinstance(mapt, dict):
         for k in mapt:
             merge_scalar_list(mapt[k], mode)
-    # elif type(mapt) == list:   # TODO: remove this line
     elif isinstance(mapt, list):
         for e in mapt:
             merge_scalar_list(e, mode)