From e19824fd2e5039841f1b59ce28ab2117c4c5fe1b Mon Sep 17 00:00:00 2001
From: Gao <mishanyo1001@gmail.com>
Date: Mon, 4 Jul 2022 15:26:56 +0800
Subject: [PATCH] Update dvc/repo/experiments/queue/base.py
 dvc/repo/experiments/queue/remove.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Peter Rowlands (변기호) <peter@pmrowla.com>
---
 dvc/repo/experiments/queue/base.py   | 4 ++--
 dvc/repo/experiments/queue/celery.py | 8 ++++----
 dvc/repo/experiments/queue/remove.py | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dvc/repo/experiments/queue/base.py b/dvc/repo/experiments/queue/base.py
index 90ec0508c..a171cf4e9 100644
--- a/dvc/repo/experiments/queue/base.py
+++ b/dvc/repo/experiments/queue/base.py
@@ -134,7 +134,7 @@ class BaseStashQueue(ABC):
     def remove(
         self,
         revs: Collection[str],
-        _all: bool = False,
+        all_: bool = False,
         queued: bool = False,
         **kwargs,
     ) -> List[str]:
@@ -149,7 +149,7 @@ class BaseStashQueue(ABC):
             Revisions (or names) which were removed.
         """
 
-        if _all or queued:
+        if all_ or queued:
             return self.clear()
 
         removed: List[str] = []
diff --git a/dvc/repo/experiments/queue/celery.py b/dvc/repo/experiments/queue/celery.py
index 97880ed41..e5a2bddee 100644
--- a/dvc/repo/experiments/queue/celery.py
+++ b/dvc/repo/experiments/queue/celery.py
@@ -351,11 +351,11 @@ class LocalCeleryQueue(BaseStashQueue):
         return status
 
     def clear(self, *args, **kwargs):
-        from .remove import clear
+        from .remove import celery_clear
 
-        return clear(self, *args, **kwargs)
+        return celery_clear(self, *args, **kwargs)
 
     def remove(self, *args, **kwargs):
-        from .remove import remove
+        from .remove import celery_remove
 
-        return remove(self, *args, **kwargs)
+        return celery_remove(self, *args, **kwargs)
diff --git a/dvc/repo/experiments/queue/remove.py b/dvc/repo/experiments/queue/remove.py
index 7de2813f6..bed3b05b7 100644
--- a/dvc/repo/experiments/queue/remove.py
+++ b/dvc/repo/experiments/queue/remove.py
@@ -92,7 +92,7 @@ def _get_names(entries: Iterable[Union["QueueEntry", "QueueDoneResult"]]):
     return names
 
 
-def clear(self: "LocalCeleryQueue", **kwargs) -> List[str]:
+def celery_clear(self: "LocalCeleryQueue", **kwargs) -> List[str]:
     """Remove entries from the queue.
 
     Arguments:
@@ -125,7 +125,7 @@ def clear(self: "LocalCeleryQueue", **kwargs) -> List[str]:
     return removed
 
 
-def remove(
+def celery_remove(
     self: "LocalCeleryQueue",
     revs: Collection[str],
     queued: bool = False,
@@ -140,7 +140,7 @@ def remove(
         queued: Remove all queued tasks.
         failed: Remove all failed tasks.
         success: Remove all success tasks.
-        all: Remove all tasks.
+        all_: Remove all tasks.
 
     Returns:
         Revisions (or names) which were removed.