Skip to content

Commit 8d2a2b4

Browse files
committed
add **kwargs to movedir() signature
1 parent d2e18b9 commit 8d2a2b4

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

fs/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,8 @@ def move(self, src, dst, overwrite=False, chunk_size=16384):
12131213
bypass_lock=True)
12141214
self.remove(src, bypass_lock=True)
12151215

1216-
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
1216+
def movedir(self, src, dst, overwrite=False, ignore_errors=False,
1217+
chunk_size=16384, **kwargs):
12171218
"""moves a directory from one location to another.
12181219
12191220
:param src: source directory path

fs/contrib/davfs/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ def remove(self,path):
577577
raise_generic_error(response,"remove",path)
578578
return True
579579

580-
def removedir(self,path,recursive=False,force=False):
580+
def removedir(self,path,recursive=False,force=False,**kwargs):
581581
if self.isfile(path):
582582
raise ResourceInvalidError(path)
583583
if not force and self.listdir(path):
@@ -712,7 +712,8 @@ def move(self,src,dst,overwrite=False,chunk_size=None):
712712
raise ResourceInvalidError(src, msg=msg)
713713
self._move(src,dst,overwrite=overwrite)
714714

715-
def movedir(self,src,dst,overwrite=False,ignore_errors=False,chunk_size=0):
715+
def movedir(self,src,dst,overwrite=False,ignore_errors=False,chunk_size=0,
716+
**kwargs):
716717
if self.isfile(src):
717718
msg = "Source is not a directory: %(path)s"
718719
raise ResourceInvalidError(src, msg=msg)

fs/contrib/tahoelafs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def makedir(self, path, recursive=False, allow_recreate=False):
306306
raise errors.ParentDirectoryMissingError(path)
307307
self.tahoeutil.mkdir(self.dircap, path)
308308

309-
def movedir(self, src, dst, overwrite=False):
309+
def movedir(self, src, dst, overwrite=False, **kwargs):
310310
self.move(src, dst, overwrite=overwrite)
311311

312312
def move(self, src, dst, overwrite=False):

fs/expose/xmlrpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def move(self, src, dst, overwrite=False, chunk_size=16384):
165165
dst = self.decode_path(dst)
166166
return self.fs.move(src, dst, overwrite, chunk_size)
167167

168-
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
168+
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384, **kwargs):
169169
src = self.decode_path(src)
170170
dst = self.decode_path(dst)
171171
return self.fs.movedir(src, dst, overwrite, ignore_errors, chunk_size)

fs/ftpfs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,8 @@ def copy(self, src, dst, overwrite=False, chunk_size=1024*64, **kwargs):
14251425

14261426

14271427
@ftperrors
1428-
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
1428+
def movedir(self, src, dst, overwrite=False, ignore_errors=False,
1429+
chunk_size=16384, **kwargs):
14291430
self.clear_dircache(dirname(src), dirname(dst))
14301431
super(FTPFS, self).movedir(src, dst, overwrite, ignore_errors, chunk_size)
14311432

fs/memoryfs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,8 @@ def copydir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=102
597597
dst_dir_entry.xattrs.update(src_xattrs)
598598

599599
@synchronize
600-
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=1024*64):
600+
def movedir(self, src, dst, overwrite=False, ignore_errors=False,
601+
chunk_size=1024*64, **kwargs):
601602
src_dir_entry = self._get_dir_entry(src)
602603
if src_dir_entry is None:
603604
raise ResourceNotFoundError(src)

fs/remote.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ def makedir(self,path,*args,**kwds):
696696
self.__cache.clear(path)
697697
self.__cache[path] = CachedInfo.new_dir_stub()
698698

699-
def remove(self,path):
699+
def remove(self,path,**kwds):
700700
super(CacheFSMixin,self).remove(path)
701701
with self.__cache_lock:
702702
self.__cache.clear(path)

fs/rpcfs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def move(self, src, dst, overwrite=False, chunk_size=16384):
349349
return self.proxy.move(src, dst, overwrite, chunk_size)
350350

351351
@synchronize
352-
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
352+
def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384, **kwargs):
353353
src = self.encode_path(src)
354354
dst = self.encode_path(dst)
355355
return self.proxy.movedir(src, dst, overwrite, ignore_errors, chunk_size)

0 commit comments

Comments
 (0)