add options for several IO operation

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.4.12] - (Unreleased)
 
+### Added
+
+- Added options for readbytes and readtext
+
 ### Changed
 
 - Start testing on PyPy. Due to [#342](https://github.com/PyFilesystem/pyfilesystem2/issues/342)

fs/base.py

@@ -221,7 +221,7 @@ def openbin(
         path,  # type: Text
         mode="r",  # type: Text
         buffering=-1,  # type: int
-        **options  # type: Any
+        **options,  # type: Any
     ):
         # type: (...) -> BinaryIO
         """Open a binary file-like object.
@@ -586,8 +586,8 @@ def exclude_file(patterns, info):
             iter_info = itertools.islice(iter_info, start, end)
         return iter_info
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         """Get the contents of a file as bytes.
 
         Arguments:
@@ -644,6 +644,7 @@ def readtext(
         encoding=None,  # type: Optional[Text]
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
+        **options,  # type: Any
     ):
         # type: (...) -> Text
         """Get the contents of a file as a string.
@@ -664,7 +665,12 @@ def readtext(
         """
         with closing(
             self.open(
-                path, mode="rt", encoding=encoding, errors=errors, newline=newline
+                path,
+                mode="rt",
+                encoding=encoding,
+                errors=errors,
+                newline=newline,
+                **options,
             )
         ) as read_file:
             contents = read_file.read()
@@ -1130,7 +1136,7 @@ def open(
         encoding=None,  # type: Optional[Text]
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
-        **options  # type: Any
+        **options,  # type: Any
     ):
         # type: (...) -> IO
         """Open a file.
@@ -1163,7 +1169,7 @@ def open(
         """
         validate_open_mode(mode)
         bin_mode = mode.replace("t", "")
-        bin_file = self.openbin(path, mode=bin_mode, buffering=buffering)
+        bin_file = self.openbin(path, mode=bin_mode, buffering=buffering, **options)
         io_stream = iotools.make_stream(
             path,
             bin_file,
@@ -1172,7 +1178,7 @@ def open(
             encoding=encoding or "utf-8",
             errors=errors,
             newline=newline,
-            **options
+            line_buffering=options.get("line_buffering", False),
         )
         return io_stream
 

fs/ftpfs.py

@@ -772,8 +772,8 @@ def setinfo(self, path, info):
         if not self.exists(path):
             raise errors.ResourceNotFound(path)
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         _path = self.validatepath(path)
         data = io.BytesIO()
         with ftp_errors(self, path):

fs/mountfs.py

@@ -186,8 +186,8 @@ def removedir(self, path):
         fs, _path = self._delegate(path)
         return fs.removedir(_path)
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         self.check()
         fs, _path = self._delegate(path)
         return fs.readbytes(_path)
@@ -203,6 +203,7 @@ def readtext(
         encoding=None,  # type: Optional[Text]
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
+        **options,  # type: Any
     ):
         # type: (...) -> Text
         self.check()
@@ -284,7 +285,7 @@ def open(
         encoding=None,  # type: Optional[Text]
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
-        **options  # type: Any
+        **options,  # type: Any
     ):
         # type: (...) -> IO
         validate_open_mode(mode)
@@ -297,7 +298,7 @@ def open(
             encoding=encoding,
             errors=errors,
             newline=newline,
-            **options
+            **options,
         )
 
     def upload(self, path, file, chunk_size=None, **options):

fs/multifs.py

@@ -280,8 +280,8 @@ def scandir(
         if not exists:
             raise errors.ResourceNotFound(path)
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         self.check()
         fs = self._delegate(path)
         if fs is None:
@@ -293,8 +293,8 @@ def download(self, path, file, chunk_size=None, **options):
         fs = self._delegate_required(path)
         return fs.download(path, file, chunk_size=chunk_size, **options)
 
-    def readtext(self, path, encoding=None, errors=None, newline=""):
-        # type: (Text, Optional[Text], Optional[Text], Text) -> Text
+    def readtext(self, path, encoding=None, errors=None, newline="", **options):
+        # type: (Text, Optional[Text], Optional[Text], Text, Any) -> Text
         self.check()
         fs = self._delegate_required(path)
         return fs.readtext(path, encoding=encoding, errors=errors, newline=newline)

fs/wrapfs.py

@@ -334,8 +334,8 @@ def filterdir(
             for info in iter_files:
                 yield info
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         self.check()
         _fs, _path = self.delegate_path(path)
         with unwrap_errors(path):
@@ -348,6 +348,7 @@ def readtext(
         encoding=None,  # type: Optional[Text]
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
+        **options,  # type: Any
     ):
         # type: (...) -> Text
         self.check()
@@ -456,7 +457,7 @@ def open(
         errors=None,  # type: Optional[Text]
         newline="",  # type: Text
         line_buffering=False,  # type: bool
-        **options  # type: Any
+        **options,  # type: Any
     ):
         # type: (...) -> IO[AnyStr]
         self.check()
@@ -470,7 +471,7 @@ def open(
                 errors=errors,
                 newline=newline,
                 line_buffering=line_buffering,
-                **options
+                **options,
             )
         return open_file
 

fs/zipfs.py

@@ -439,8 +439,8 @@ def close(self):
         if hasattr(self, "_zip"):
             self._zip.close()
 
-    def readbytes(self, path):
-        # type: (Text) -> bytes
+    def readbytes(self, path, **options):
+        # type: (Text, Any) -> bytes
         self.check()
         if not self._directory.isfile(path):
             raise errors.ResourceNotFound(path)