multifs compatability with new errors module

1 files changed, 10 insertions, 20 deletions

diff --git a/fs/multifs.py b/fs/multifs.py
index d41580a..0f78a06 100644
--- a/fs/multifs.py
+++ b/fs/multifs.py
@@ -13,7 +13,7 @@ class MultiFS(FS):
     """
 
     def __init__(self):
-        FS.__init__(self, thread_syncronize=True)
+        FS.__init__(self, thread_synchronize=True)
 
         self.fs_sequence = []
         self.fs_lookup =  {}
@@ -99,7 +99,7 @@ class MultiFS(FS):
                     for fs_name, fs_object in self.fs_lookup.iteritems():
                         if fs is fs_object:
                             return fs_name, fs
-            raise ResourceNotFoundError("NO_RESOURCE", path, msg="Path does not map to any filesystem: %(path)s")
+            raise ResourceNotFoundError(path, msg="Path does not map to any filesystem: %(path)s")
         finally:
             self._lock.release()
 
@@ -109,7 +109,7 @@ class MultiFS(FS):
             fs = self._delegate_search(path)
             if fs is not None:
                 return fs.getsyspath(path, allow_none=allow_none)
-            raise ResourceNotFoundError("NO_RESOURCE", path)
+            raise ResourceNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -117,7 +117,7 @@ class MultiFS(FS):
         self._lock.acquire()
         try:
             if not self.exists(path):
-                raise ResourceNotFoundError("NO_RESOURCE", path)
+                raise ResourceNotFoundError(path)
 
             name, fs = self.which(path)
             if name is None:
@@ -135,7 +135,7 @@ class MultiFS(FS):
                     fs_file = fs.open(path, mode, **kwargs)
                     return fs_file
 
-            raise ResourceNotFoundError("NO_FILE", path)
+            raise FileNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -166,16 +166,6 @@ class MultiFS(FS):
         finally:
             self._lock.release()
 
-    def ishidden(self, path):
-        self._lock.acquire()
-        try:
-            fs = self._delegate_search(path)
-            if fs is not None:
-                return fs.isfile(path)
-            return False
-        finally:
-            self._lock.release()
-
     def listdir(self, path="./", *args, **kwargs):
         self._lock.acquire()
         try:
@@ -197,7 +187,7 @@ class MultiFS(FS):
                 if fs.exists(path):
                     fs.remove(path)
                     return
-            raise ResourceNotFoundError("NO_FILE", path)
+            raise FileNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -208,7 +198,7 @@ class MultiFS(FS):
                 if fs.isdir(path):
                     fs.removedir(path, recursive)
                     return
-            raise ResourceNotFoundError("NO_DIR", path)
+            raise DirectoryNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -221,7 +211,7 @@ class MultiFS(FS):
                 if fs.exists(src):
                     fs.rename(src, dst)
                     return
-            raise FSError("NO_RESOURCE", path)
+            raise ResourceNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -232,7 +222,7 @@ class MultiFS(FS):
                 if fs.exists(path):
                     return fs.getinfo(path)
 
-            raise ResourceNotFoundError("NO_FILE", path)
+            raise ResourceNotFoundError(path)
         finally:
             self._lock.release()
 
@@ -259,4 +249,4 @@ if __name__ == "__main__":
 
     import browsewin
 
-    browsewin.browse(multifs)
\ No newline at end of file
+    browsewin.browse(multifs)