megfile 4.0.3__py3-none-any.whl → 4.1.0__py3-none-any.whl

megfile/lib/s3_memory_handler.py

@@ -21,15 +21,15 @@ class S3MemoryHandler(Readable[bytes], Seekable, Writable[bytes]):
         s3_client,
         profile_name: Optional[str] = None,
     ):
-        if mode not in ("rb", "wb", "ab", "rb+", "wb+", "ab+"):
-            raise ValueError("unacceptable mode: %r" % mode)
-
         self._bucket = bucket
         self._key = key
         self._mode = mode
         self._client = s3_client
         self._profile_name = profile_name
 
+        if mode not in ("rb", "wb", "ab", "rb+", "wb+", "ab+"):
+            raise ValueError("unacceptable mode: %r" % mode)
+
         self._fileobj = BytesIO()
         self._download_fileobj()
 

megfile/lib/s3_pipe_handler.py

@@ -34,9 +34,6 @@ class S3PipeHandler(Readable[bytes], Writable[bytes]):
         join_thread: bool = True,
         profile_name: Optional[str] = None,
     ):
-        if mode not in ("rb", "wb"):
-            raise ValueError("unacceptable mode: %r" % mode)
-
         self._bucket = bucket
         self._key = key
         self._mode = mode
@@ -45,6 +42,9 @@ class S3PipeHandler(Readable[bytes], Writable[bytes]):
         self._offset = 0
         self._profile_name = profile_name
 
+        if mode not in ("rb", "wb"):
+            raise ValueError("unacceptable mode: %r" % mode)
+
         self._exc = None
         self._pipe = os.pipe()
         _s3_opened_pipes.append(self._pipe)
@@ -76,7 +76,7 @@ class S3PipeHandler(Readable[bytes], Writable[bytes]):
         try:
             with os.fdopen(self._pipe[1], "wb") as buffer:
                 self._client.download_fileobj(self._bucket, self._key, buffer)
-        except BrokenPipeError:
+        except BrokenPipeError:  # pragma: no cover
             if self._fileobj.closed:
                 return
             raise

megfile/pathlike.py

@@ -412,7 +412,7 @@ class BasePath:
         raw_suffix = self.suffix
         return self.from_path(path[: len(path) - len(raw_suffix)] + suffix)
 
-    def relpath(self, start=None):
+    def relpath(self, start: Optional[str] = None):
         """Return the relative path."""
         if start is None:
             raise TypeError("start is required")
@@ -485,7 +485,7 @@ class BasePath:
         """Return the canonical path of the path."""
         return self.path_with_protocol
 
-    def resolve(self):
+    def resolve(self, strict=False):
         """Alias of realpath."""
         return self.path_with_protocol
 
@@ -615,18 +615,18 @@ class BasePath:
         """Return the names of the entries in the directory the path points to."""
         raise NotImplementedError('method "listdir" not implemented: %r' % self)
 
-    def scandir(self) -> Iterator[FileEntry]:
+    def scandir(self):
         """
         Return an iterator of FileEntry objects corresponding to the entries
         in the directory.
         """
         raise NotImplementedError('method "scandir" not implemented: %r' % self)
 
-    def getsize(self, follow_symlinks: bool = True) -> int:
+    def getsize(self, follow_symlinks: bool = False) -> int:
         """Return the size, in bytes."""
         raise NotImplementedError('method "getsize" not implemented: %r' % self)
 
-    def getmtime(self, follow_symlinks: bool = True) -> float:
+    def getmtime(self, follow_symlinks: bool = False) -> float:
         """Return the time of last modification."""
         raise NotImplementedError('method "getmtime" not implemented: %r' % self)
 

megfile/s3.py

@@ -73,9 +73,7 @@ __all__ = [
 ]
 
 
-def s3_access(
-    path: PathLike, mode: Access = Access.READ, followlinks: bool = False
-) -> bool:
+def s3_access(path: PathLike, mode: Access = Access.READ) -> bool:
     """
     Test if path has access permission described by mode
 
@@ -83,7 +81,7 @@ def s3_access(
     :param mode: access mode
     :returns: bool, if the bucket of s3_url has read/write access.
     """
-    return S3Path(path).access(mode, followlinks)
+    return S3Path(path).access(mode)
 
 
 def s3_exists(path: PathLike, followlinks: bool = False) -> bool:
@@ -161,7 +159,7 @@ def s3_isfile(path: PathLike, followlinks: bool = False) -> bool:
     return S3Path(path).is_file(followlinks)
 
 
-def s3_listdir(path: PathLike, followlinks: bool = False) -> List[str]:
+def s3_listdir(path: PathLike) -> List[str]:
     """
     Get all contents of given s3_url. The result is in ascending alphabetical order.
 
@@ -169,10 +167,10 @@ def s3_listdir(path: PathLike, followlinks: bool = False) -> List[str]:
     :returns: All contents have prefix of s3_url in ascending alphabetical order
     :raises: S3FileNotFoundError, S3NotADirectoryError
     """
-    return S3Path(path).listdir(followlinks)
+    return S3Path(path).listdir()
 
 
-def s3_load_from(path: PathLike, followlinks: bool = False) -> BinaryIO:
+def s3_load_from(path: PathLike) -> BinaryIO:
     """Read all content in binary on specified path and write into memory
 
     User should close the BinaryIO manually
@@ -180,7 +178,7 @@ def s3_load_from(path: PathLike, followlinks: bool = False) -> BinaryIO:
     :param path: Given path
     :returns: BinaryIO
     """
-    return S3Path(path).load(followlinks)
+    return S3Path(path).load()
 
 
 def s3_hasbucket(path: PathLike) -> bool:
@@ -260,15 +258,15 @@ def s3_scan_stat(
     return S3Path(path).scan_stat(missing_ok, followlinks)
 
 
-def s3_scandir(path: PathLike, followlinks: bool = False) -> Iterator[FileEntry]:
+def s3_scandir(path: PathLike) -> Iterator[FileEntry]:
     """
-    Get all contents of given s3_url, the order of result is not guaranteed.
+    Get all contents of given s3_url, the order of result is in arbitrary order.
 
     :param path: Given path
     :returns: All contents have prefix of s3_url
     :raises: S3FileNotFoundError, S3NotADirectoryError
     """
-    return S3Path(path).scandir(followlinks)
+    return S3Path(path).scandir()
 
 
 def s3_stat(path: PathLike, follow_symlinks=True) -> StatResult:
@@ -453,7 +451,6 @@ def s3_glob(
     path: PathLike,
     recursive: bool = True,
     missing_ok: bool = True,
-    followlinks: bool = False,
 ) -> List[str]:
     """Return s3 path list in ascending alphabetical order,
     in which path matches glob pattern
@@ -472,7 +469,6 @@ def s3_glob(
             path=path,
             recursive=recursive,
             missing_ok=missing_ok,
-            followlinks=followlinks,
         )
     )
 
@@ -481,7 +477,6 @@ def s3_glob_stat(
     path: PathLike,
     recursive: bool = True,
     missing_ok: bool = True,
-    followlinks: bool = False,
 ) -> Iterator[FileEntry]:
     """Return a generator contains tuples of path and file stat,
     in ascending alphabetical order, in which path matches glob pattern
@@ -497,7 +492,7 @@ def s3_glob_stat(
         in which paths match `s3_pathname`
     """
     return S3Path(path).glob_stat(
-        pattern="", recursive=recursive, missing_ok=missing_ok, followlinks=followlinks
+        pattern="", recursive=recursive, missing_ok=missing_ok
     )
 
 
@@ -505,7 +500,6 @@ def s3_iglob(
     path: PathLike,
     recursive: bool = True,
     missing_ok: bool = True,
-    followlinks: bool = False,
 ) -> Iterator[str]:
     """Return s3 path iterator in ascending alphabetical order,
     in which path matches glob pattern
@@ -520,7 +514,7 @@ def s3_iglob(
     :returns: An iterator contains paths match `s3_pathname`
     """
     for path_obj in S3Path(path).iglob(
-        pattern="", recursive=recursive, missing_ok=missing_ok, followlinks=followlinks
+        pattern="", recursive=recursive, missing_ok=missing_ok
     ):
         yield path_obj.path_with_protocol