From 09789a0b23c66b4221a944c82ba2d6c5fd0635b8 Mon Sep 17 00:00:00 2001
From: yanghua <yanghua1127@gmail.com>
Date: Tue, 20 Aug 2024 11:16:42 +0800
Subject: [PATCH] Address review concerns

---
 tosfs/core.py | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/tosfs/core.py b/tosfs/core.py
index 7fb6604..b9006f4 100644
--- a/tosfs/core.py
+++ b/tosfs/core.py
@@ -231,7 +231,8 @@ def rmdir(self, path: str) -> None:
         path = self._strip_protocol(path).rstrip("/") + "/"
         bucket, key, _ = self._split_path(path)
         if not key:
-            return self._rm_bucket(path)
+            logger.error("Cannot remove a bucket using rmdir api.")
+            raise TosfsError("Cannot remove a bucket using rmdir api.")
 
         if not self.exists(path):
             raise FileNotFoundError(f"Directory {path} not found.")
@@ -255,35 +256,6 @@ def rmdir(self, path: str) -> None:
             logger.error("Tosfs failed with unknown error: %s", e)
             raise TosfsError(f"Tosfs failed with unknown error: {e}") from e
 
-    def _rm_bucket(self, path: str) -> None:
-        """Remove a bucket."""
-        bucket, _, _ = self._split_path(path)
-
-        try:
-            # if the bucket is not empty, raise an error
-            if len(self.ls(bucket, refresh=True, detail=False)) > 0:
-                logger.warning(
-                    "Try to delete bucket %s, "
-                    "but delete failed due to bucket is not empty.",
-                    bucket,
-                )
-                raise TosfsError(f"Bucket {bucket} is not empty.")
-
-            logger.warning("Deleting an empty bucket %s", bucket)
-            self.tos_client.delete_bucket(bucket)
-        except tos.exceptions.TosClientError as e:
-            logger.error("Tosfs failed with client error: %s", e)
-            raise e
-        except tos.exceptions.TosServerError as e:
-            logger.error("Tosfs failed with server error: %s", e)
-            raise e
-        except Exception as e:
-            logger.error("Tosfs failed with unknown error: %s", e)
-            raise TosfsError(f"Tosfs failed with unknown error: {e}") from e
-
-        self.invalidate_cache(path.rstrip("/"))
-        self.invalidate_cache("")
-
     def _info_from_cache(
         self, path: str, fullpath: str, version_id: Optional[str]
     ) -> dict: