megfile 4.2.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

megfile/s3_path.py

@@ -1676,15 +1676,18 @@ class S3Path(URIPath):
         :returns: True if path is s3 file, else False
         """
         s3_url = self.path_with_protocol
+        bucket, key = parse_s3_url(s3_url)
+        if not bucket or not key or key.endswith("/"):
+            # s3://, s3:///key, s3://bucket, s3://bucket/prefix/
+            return False
+
         if followlinks:
             try:
                 s3_url = self.readlink().path_with_protocol
+                bucket, key = parse_s3_url(s3_url)
             except S3NotALinkError:
                 pass
-        bucket, key = parse_s3_url(s3_url)
-        if not bucket or not key or key.endswith("/"):
-            # s3://, s3:///key, s3://bucket, s3://bucket/prefix/
-            return False
+
         try:
             self._client.head_object(Bucket=bucket, Key=key)
         except Exception as error:
@@ -1829,18 +1832,18 @@ class S3Path(URIPath):
             )
         if not key:
             raise UnsupportedError("Remove bucket", self.path_with_protocol)
-        if not self.exists():
-            if missing_ok:
-                return
-            raise S3FileNotFoundError(
-                "No such file or directory: %r" % self.path_with_protocol
-            )
 
         client = self._client
+        if self.is_file():
+            try:
+                with raise_s3_error(self.path_with_protocol):
+                    client.delete_object(Bucket=bucket, Key=key)
+            except S3FileNotFoundError:
+                if not missing_ok:
+                    raise
+            return
+
         with raise_s3_error(self.path_with_protocol):
-            if self.is_file():
-                client.delete_object(Bucket=bucket, Key=key)
-                return
             prefix = _become_prefix(key)
             total_count, error_count = 0, 0
             for resp in _list_objects_recursive(client, bucket, prefix):
@@ -1891,6 +1894,10 @@ class S3Path(URIPath):
                     % (self.path_with_protocol, total_count, error_count)
                 )
                 raise S3UnknownError(Exception(error_msg), self.path_with_protocol)
+            if total_count == 0 and not missing_ok:
+                raise S3FileNotFoundError(
+                    "No such file or directory: %r" % self.path_with_protocol
+                )
 
     def rename(self, dst_path: PathLike, overwrite: bool = True) -> "S3Path":
         """

megfile/version.py

@@ -1 +1 @@
-VERSION = "4.2.0"
+VERSION = "4.2.1"

{megfile-4.2.0.dist-info → megfile-4.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: megfile
-Version: 4.2.0
+Version: 4.2.1
 Summary: Megvii file operation library
 Author-email: megvii <megfile@megvii.com>
 Project-URL: Homepage, https://github.com/megvii-research/megfile

{megfile-4.2.0.dist-info → megfile-4.2.1.dist-info}/RECORD

@@ -11,14 +11,14 @@ megfile/http_path.py,sha256=08OmzmRMyLSyq1Yr1K2HbzexesURJrIoA6AibwYzUiA,13844
 megfile/interfaces.py,sha256=p4UvVZpeLx5djd6bqqDaygIx_s-_AxIVj-gudTch4JE,8467
 megfile/pathlike.py,sha256=3Hnw-fn6RcIe9iPrJt00QdHSA--UfDyxnVBuZ_ymYYQ,31278
 megfile/s3.py,sha256=abBxnI7RIyn7n7qjGszP1VruYd6Gi9I8QnUOvsHkx1Y,16325
-megfile/s3_path.py,sha256=nA1FXFwfhSvZN8W0mF2PKGbnaTDouZfp6anUZkxvOBc,93449
+megfile/s3_path.py,sha256=NKOJLxy1gxdOc-jdEvxNl45tham5un8YWmZC-CZXHuU,93663
 megfile/sftp.py,sha256=uBcLQs-j6Q-q-sWAdd-pgi5Qmb_kq7boJM-0sCfcNO0,26540
 megfile/sftp_path.py,sha256=CgirHWmNdXdqyIL9ufmlaMpwFhlkQVZhqmfvjUaj7qU,43845
 megfile/smart.py,sha256=Miz3jyLKmwWBja-8GrSzrumpTarPrFPqXaFQJKwrK1Y,36627
 megfile/smart_path.py,sha256=Up_6xNZ2019iSzMn_JAU_1H--z-AP6O7SxdXGdeTG0c,7659
 megfile/stdio.py,sha256=ZwxsnJNJYIT7Iyg5pIw4qiyH8bszG6oAhEJuR-hXGG4,658
 megfile/stdio_path.py,sha256=cxaDr8rtisTPnN-rjtaEpqQnshwiqwXFUJBM9xWY7Cg,2711
-megfile/version.py,sha256=nmN7kc0bNHgtVq4jv4MJKEo-L3X7QgGHAv_z6zkMVSQ,19
+megfile/version.py,sha256=e0k-2Nn8dpoGmVJ3Wg03fcRMzM9q9jfKeY7f3OkI7LE,19
 megfile/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megfile/lib/base_prefetch_reader.py,sha256=uxVwYknOjc8hLF7q_T2QKMsBqFcrf411ZsuK25CN1eQ,12848
 megfile/lib/combine_reader.py,sha256=Kp2wEloOUpTlIU7dve87MBpSzmIM-F9OtpTawAjFkiU,4828
@@ -43,10 +43,10 @@ megfile/lib/stdio_handler.py,sha256=IDdgENLQlhigEwkLL4zStueVSzdWg7xVcTF_koof_Ek,
 megfile/lib/url.py,sha256=ER32pWy9Q2MAk3TraAaNEBWIqUeBmLuM57ol2cs7-Ks,103
 megfile/utils/__init__.py,sha256=pawmXnCNokWLj338a60b_hK21koYavpEiEohZhsOaGQ,10156
 megfile/utils/mutex.py,sha256=asb8opGLgK22RiuBJUnfsvB8LnMmodP8KzCVHKmQBWA,2561
-megfile-4.2.0.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-megfile-4.2.0.dist-info/licenses/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
-megfile-4.2.0.dist-info/METADATA,sha256=0IuIzy3B0sO0YhPrMdEK5kCkK16K1ZCX6w3vZO-SlB4,9595
-megfile-4.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-megfile-4.2.0.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
-megfile-4.2.0.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
-megfile-4.2.0.dist-info/RECORD,,
+megfile-4.2.1.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+megfile-4.2.1.dist-info/licenses/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
+megfile-4.2.1.dist-info/METADATA,sha256=8-Gzye2STZTocHieLky8XR0nAae8sHEmanRVeTWKWYM,9595
+megfile-4.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+megfile-4.2.1.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
+megfile-4.2.1.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
+megfile-4.2.1.dist-info/RECORD,,