use **kwargs in copy() signature

Author: giampaolo

fs/base.py

@@ -803,7 +803,7 @@ def _setcontents(self,
                      chunk_size=1024 * 64,
                      progress_callback=None,
                      finished_callback=None,
-                     bypass_lock=False):
+                     **kwargs):
         """Does the work of setcontents. Factored out, so that `setcontents_async` can use it"""
         if progress_callback is None:
             progress_callback = lambda bytes_written: None
@@ -824,9 +824,9 @@ def _setcontents(self,
             chunk = read(chunk_size)
             if isinstance(chunk, six.text_type):
                 f = self.open(path, 'wt', encoding=encoding, errors=errors,
-                              bypass_lock=bypass_lock)
+                              **kwargs)
             else:
-                f = self.open(path, 'wb', bypass_lock=bypass_lock)
+                f = self.open(path, 'wb', **kwargs)
             write = f.write
             try:
                 while chunk:
@@ -851,7 +851,7 @@ def _setcontents(self,
         return bytes_written
 
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=1024 * 64, bypass_lock=False):
+                    chunk_size=1024 * 64, **kwargs):
         """A convenience method to create a new file from a string or file-like object
 
         :param path: a path of the file to create
@@ -861,7 +861,7 @@ def setcontents(self, path, data=b'', encoding=None, errors=None,
         :param chunk_size: Number of bytes to read in a chunk, if the implementation has to resort to a read / copy loop
 
         """
-        return self._setcontents(path, data, encoding=encoding, errors=errors, chunk_size=1024 * 64, bypass_lock=bypass_lock)
+        return self._setcontents(path, data, encoding=encoding, errors=errors, chunk_size=1024 * 64, **kwargs)
 
     def setcontents_async(self,
                           path,
@@ -1113,7 +1113,7 @@ def getsize(self, path):
             raise OperationFailedError("get size of resource", path)
         return size
 
-    def copy(self, src, dst, overwrite=False, chunk_size=1024 * 64):
+    def copy(self, src, dst, overwrite=False, chunk_size=1024 * 64, **kwargs):
         """Copies a file from src to dst.
 
         :param src: the source path

fs/contrib/davfs/__init__.py

@@ -346,7 +346,7 @@ def new_close():
             raise RemoteConnectionError("",msg=msg,details=e)
 
     def setcontents(self,path, data=b'', encoding=None, errors=None,
-                    chunk_size=1024 * 64, bypass_lock=False):
+                    chunk_size=1024 * 64, **kwargs):
         if isinstance(data, six.text_type):
             data = data.encode(encoding=encoding, errors=errors)
         resp = self._request(path, "PUT", data)
@@ -679,7 +679,7 @@ def _info_from_propfind(self,res):
         return info
 
 
-    def copy(self,src,dst,overwrite=False,chunk_size=None):
+    def copy(self, src, dst, overwrite=False, chunk_size=None, **kwargs):
         if self.isdir(src):
             msg = "Source is not a file: %(path)s"
             raise ResourceInvalidError(src, msg=msg)

fs/contrib/tahoelafs/__init__.py

@@ -361,7 +361,7 @@ def getrange(self, path, offset, length=None):
                     offset=offset, length=length)
 
     @_fix_path
-    def setcontents(self, path, file, chunk_size=64*1024, bypass_lock=False):
+    def setcontents(self, path, file, chunk_size=64*1024, **kwargs):
         self._log(INFO, 'Uploading file %s' % path)
         size=None
 

fs/expose/xmlrpc.py

@@ -155,7 +155,7 @@ def listxattrs(self, path):
         path = self.decode_path(path)
         return [self.encode_path(a) for a in self.fs.listxattrs(path)]
 
-    def copy(self, src, dst, overwrite=False, chunk_size=16384):
+    def copy(self, src, dst, overwrite=False, chunk_size=16384, **kwargs):
         src = self.decode_path(src)
         dst = self.decode_path(dst)
         return self.fs.copy(src, dst, overwrite, chunk_size)

fs/ftpfs.py

@@ -1173,7 +1173,7 @@ def open(self, path, mode, buffering=-1, encoding=None, errors=None, newline=Non
 
     @ftperrors
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=1024*64, bypass_lock=False):
+                    chunk_size=1024*64, **kwargs):
         path = normpath(path)
         data = iotools.make_bytes_io(data, encoding=encoding, errors=errors)
         self.refresh_dircache(dirname(path))
@@ -1403,7 +1403,7 @@ def move(self, src, dst, overwrite=False, chunk_size=16384):
             self.refresh_dircache(src, dirname(src), dst, dirname(dst))
 
     @ftperrors
-    def copy(self, src, dst, overwrite=False, chunk_size=1024*64):
+    def copy(self, src, dst, overwrite=False, chunk_size=1024*64, **kwargs):
         if not self.isfile(src):
             if self.isdir(src):
                 raise ResourceInvalidError(src, msg="Source is not a file: %(path)s")

fs/memoryfs.py

@@ -608,12 +608,12 @@ def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=102
             dst_dir_entry.xattrs.update(src_xattrs)
 
     @synchronize
-    def copy(self, src, dst, overwrite=False, chunk_size=1024*64):
+    def copy(self, src, dst, overwrite=False, chunk_size=1024*64, **kwargs):
         src_dir_entry = self._get_dir_entry(src)
         if src_dir_entry is None:
             raise ResourceNotFoundError(src)
         src_xattrs = src_dir_entry.xattrs.copy()
-        super(MemoryFS, self).copy(src, dst, overwrite, chunk_size)
+        super(MemoryFS, self).copy(src, dst, overwrite, chunk_size, **kwargs)
         dst_dir_entry = self._get_dir_entry(dst)
         if dst_dir_entry is not None:
             dst_dir_entry.xattrs.update(src_xattrs)
@@ -643,7 +643,7 @@ def getcontents(self, path, mode="rb", encoding=None, errors=None, newline=None)
 
     @synchronize
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=1024*64, bypass_lock=False):
+                    chunk_size=1024*64, **kwargs):
         if isinstance(data, six.binary_type):
             if not self.exists(path):
                 self.open(path, 'wb').close()
@@ -657,7 +657,7 @@ def setcontents(self, path, data=b'', encoding=None, errors=None,
 
         return super(MemoryFS, self).setcontents(
             path, data=data, encoding=encoding, errors=errors,
-            chunk_size=chunk_size, bypass_lock=bypass_lock)
+            chunk_size=chunk_size, **kwargs)
 
         # if isinstance(data, six.text_type):
         #     return super(MemoryFS, self).setcontents(path, data, encoding=encoding, errors=errors, chunk_size=chunk_size)

fs/mountfs.py

@@ -313,19 +313,19 @@ def open(self, path, mode='r', buffering=-1, encoding=None, errors=None, newline
 
     @synchronize
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=64*1024, bypass_lock=False):
+                    chunk_size=64*1024, **kwargs):
         obj = self.mount_tree.get(path, None)
         if type(obj) is MountFS.FileMount:
             return super(MountFS, self).setcontents(path,
                                                     data,
                                                     encoding=encoding,
                                                     errors=errors,
                                                     chunk_size=chunk_size,
-                                                    bypass_lock=bypass_lock)
+                                                    **kwargs)
         fs, _mount_path, delegate_path = self._delegate(path)
         if fs is self or fs is None:
             raise ParentDirectoryMissingError(path)
-        return fs.setcontents(delegate_path, data, encoding=encoding, errors=errors, chunk_size=chunk_size, bypass_lock=False)
+        return fs.setcontents(delegate_path, data, encoding=encoding, errors=errors, chunk_size=chunk_size)
 
     @synchronize
     def createfile(self, path, wipe=False):

fs/osfs/__init__.py

@@ -239,10 +239,10 @@ def open(self, path, mode='r', buffering=-1, encoding=None, errors=None, newline
 
     @convert_os_errors
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=64 * 1024, bypass_lock=False):
+                    chunk_size=64 * 1024, **kwargs):
         return super(OSFS, self).setcontents(
             path, data, encoding=encoding, errors=errors,
-            chunk_size=chunk_size, bypass_lock=bypass_lock)
+            chunk_size=chunk_size, **kwargs)
 
     @convert_os_errors
     def exists(self, path):

fs/remote.py

@@ -318,9 +318,9 @@ def __init__(self,wrapped_fs,poll_interval=None,connected=True):
         self.connected = connected
 
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=64*1024, bypass_lock=False):
+                    chunk_size=64*1024, **kwargs):
         return self.wrapped_fs.setcontents(path, data, encoding=encoding,
-            errors=errors, chunk_size=chunk_size, bypass_lock=bypass_lock)
+            errors=errors, chunk_size=chunk_size)
 
     def __getstate__(self):
         state = super(ConnectionManagerFS,self).__getstate__()
@@ -675,10 +675,10 @@ def getsize(self,path):
         return self.getinfo(path)["size"]
 
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=64*1024, bypass_lock=False):
+                    chunk_size=64*1024, **kwargs):
         supsc = super(CacheFSMixin, self).setcontents
         res = supsc(path, data, encoding=None, errors=None,
-                    chunk_size=chunk_size, bypass_lock=bypass_lock)
+                    chunk_size=chunk_size, **kwargs)
         with self.__cache_lock:
             self.__cache.clear(path)
             self.__cache[path] = CachedInfo.new_file_stub()

fs/s3fs.py

@@ -273,7 +273,7 @@ def getpathurl(self, path, allow_none=False, expires=3600):
         return url
 
     def setcontents(self, path, data=b'', encoding=None, errors=None,
-                    chunk_size=64*1024, bypass_lock=False):
+                    chunk_size=64*1024, **kwargs):
         s3path = self._s3path(path)
         if isinstance(data, six.text_type):
             data = data.encode(encoding=encoding, errors=errors)
@@ -595,7 +595,7 @@ def _get_key_info(self,key,name=None):
     def desc(self,path):
         return "No description available"
 
-    def copy(self,src,dst,overwrite=False,chunk_size=16384):
+    def copy(self,src,dst,overwrite=False,chunk_size=16384, **kwargs):
         """Copy a file from 'src' to 'dst'.
 
         src -- The source path