OSFS.rename() - catch ENOTEMPTY and convert to UnsupportedError

1 files changed, 10 insertions, 1 deletions

diff --git a/fs/osfs.py b/fs/osfs.py
index 9d42eee..74c7741 100644
--- a/fs/osfs.py
+++ b/fs/osfs.py
@@ -177,7 +177,16 @@ class OSFS(FS):
     def rename(self, src, dst):
         path_src = self.getsyspath(src)
         path_dst = self.getsyspath(dst)
-        os.rename(path_src, path_dst)
+        try:
+            os.rename(path_src, path_dst)
+        except OSError, e:
+            #  Linux (at least) can rename over an empty directory but gives
+            #  ENOTEMPTY if the dir has contents.  Raise UnsupportedError
+            #  instead of DirectoryEmptyError in this case.
+            if e.errno and e.errno == errno.ENOTEMPTY:
+                raise UnsupportedError("rename")
+            raise
+            
 
     def _stat(self,path):
         """Stat the given path, normalising error codes."""