Update fs.expose.ftp for compatibility with latest pyftpdlib.

Makefile

@@ -0,0 +1,23 @@
+PYTHON=python
+TSCRIPT=fs/tests/runner.py
+
+all: test
+
+clean:
+	rm -f `find . -type f -name \*.py[co]`
+	rm -f `find . -type f -name \*.so`
+	rm -f `find . -type f -name \*.~`
+	rm -f `find . -type f -name \*.orig`
+	rm -f `find . -type f -name \*.bak`
+	rm -f `find . -type f -name \*.rej`
+	rm -rf `find . -type d -name __pycache__`
+	rm -rf *.egg-info
+	rm -rf build
+	rm -rf dist
+
+install:
+	$(PYTHON) setup.py build
+	$(PYTHON) setup.py develop
+
+test: install
+	$(PYTHON) $(TSCRIPT)

fs/__init__.py

@@ -15,7 +15,7 @@
 
 """
 
-__version__ = "0.5.4a1"
+__version__ = "0.5.4"
 __author__ = "Will McGugan (will@willmcgugan.com)"
 
 #  provide these by default so people can use 'fs.path.basename' etc.

fs/base.py

@@ -641,7 +641,7 @@ def makedir(self, path, recursive=False, allow_recreate=False):
         """
         raise UnsupportedError("make directory")
 
-    def remove(self, path):
+    def remove(self, path, **kwargs):
         """Remove a file from the filesystem.
 
         :param path: Path of the resource to remove
@@ -654,7 +654,7 @@ def remove(self, path):
         """
         raise UnsupportedError("remove resource")
 
-    def removedir(self, path, recursive=False, force=False):
+    def removedir(self, path, recursive=False, force=False, **kwargs):
         """Remove a directory from the filesystem
 
         :param path: path of the directory to remove
@@ -802,7 +802,8 @@ def _setcontents(self,
                      errors=None,
                      chunk_size=1024 * 64,
                      progress_callback=None,
-                     finished_callback=None):
+                     finished_callback=None,
+                     **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
@@ -822,9 +823,10 @@ def _setcontents(self,
             read = data.read
             chunk = read(chunk_size)
             if isinstance(chunk, six.text_type):
-                f = self.open(path, 'wt', encoding=encoding, errors=errors)
+                f = self.open(path, 'wt', encoding=encoding, errors=errors,
+                              **kwargs)
             else:
-                f = self.open(path, 'wb')
+                f = self.open(path, 'wb', **kwargs)
             write = f.write
             try:
                 while chunk:
@@ -848,7 +850,8 @@ def _setcontents(self,
         finished_callback()
         return bytes_written
 
-    def setcontents(self, path, data=b'', encoding=None, errors=None, chunk_size=1024 * 64):
+    def setcontents(self, path, data=b'', encoding=None, errors=None,
+                    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
@@ -858,7 +861,7 @@ def setcontents(self, path, data=b'', encoding=None, errors=None, chunk_size=102
         :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)
+        return self._setcontents(path, data, encoding=encoding, errors=errors, chunk_size=1024 * 64, **kwargs)
 
     def setcontents_async(self,
                           path,
@@ -1110,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
@@ -1143,7 +1146,8 @@ def copy(self, src, dst, overwrite=False, chunk_size=1024 * 64):
                 src_file = None
                 try:
                     src_file = self.open(src, "rb")
-                    self.setcontents(dst, src_file, chunk_size=chunk_size)
+                    self.setcontents(dst, src_file, chunk_size=chunk_size,
+                                     bypass_lock=True)
                 except ResourceNotFoundError:
                     if self.exists(src) and not self.exists(dirname(dst)):
                         raise ParentDirectoryMissingError(dst)
@@ -1205,10 +1209,12 @@ def move(self, src, dst, overwrite=False, chunk_size=16384):
                     return
                 except OSError:
                     pass
-            self.copy(src, dst, overwrite=overwrite, chunk_size=chunk_size)
-            self.remove(src)
+            self.copy(src, dst, overwrite=overwrite, chunk_size=chunk_size,
+                      bypass_lock=True)
+            self.remove(src, bypass_lock=True)
 
-    def movedir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
+    def movedir(self, src, dst, overwrite=False, ignore_errors=False,
+                chunk_size=16384, **kwargs):
         """moves a directory from one location to another.
 
         :param src: source directory path
@@ -1274,7 +1280,10 @@ def movefile_noerrors(src, dst, **kwargs):
                     dst_filename = pathjoin(dst_dirpath, filename)
                     movefile(src_filename, dst_filename, overwrite=overwrite, chunk_size=chunk_size)
 
-                self.removedir(dirname)
+                if dirname == src:
+                    self.removedir(dirname, bypass_lock=True)
+                else:
+                    self.removedir(dirname)
 
     def copydir(self, src, dst, overwrite=False, ignore_errors=False, chunk_size=16384):
         """copies a directory from one location to another.

fs/contrib/archivefs.py

@@ -318,7 +318,7 @@ def getsize(self, path):
         else:
             return fs.getsize(delegate_path)
 
-    def remove(self, path):
+    def remove(self, path, **kwargs):
         """A remove() override that deletes an archive directly. It is not fooled
         by a mounted archive. If the path is not an archive, the call is delegated."""
         if libarchive.is_archive_name(path) and self.ismount(path):

fs/contrib/davfs/__init__.py

@@ -345,7 +345,8 @@ def new_close():
                 msg = str(e)
             raise RemoteConnectionError("",msg=msg,details=e)
 
-    def setcontents(self,path, data=b'', encoding=None, errors=None, chunk_size=1024 * 64):
+    def setcontents(self,path, data=b'', encoding=None, errors=None,
+                    chunk_size=1024 * 64, **kwargs):
         if isinstance(data, six.text_type):
             data = data.encode(encoding=encoding, errors=errors)
         resp = self._request(path, "PUT", data)
@@ -576,7 +577,7 @@ def remove(self,path):
             raise_generic_error(response,"remove",path)
         return True
 
-    def removedir(self,path,recursive=False,force=False):
+    def removedir(self,path,recursive=False,force=False,**kwargs):
         if self.isfile(path):
             raise ResourceInvalidError(path)
         if not force and self.listdir(path):
@@ -678,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)
@@ -711,7 +712,8 @@ def move(self,src,dst,overwrite=False,chunk_size=None):
             raise ResourceInvalidError(src, msg=msg)
         self._move(src,dst,overwrite=overwrite)
 
-    def movedir(self,src,dst,overwrite=False,ignore_errors=False,chunk_size=0):
+    def movedir(self,src,dst,overwrite=False,ignore_errors=False,chunk_size=0,
+                **kwargs):
         if self.isfile(src):
             msg = "Source is not a directory: %(path)s"
             raise ResourceInvalidError(src, msg=msg)