Fixes for fsmount

1 files changed, 14 insertions, 8 deletions

diff --git a/fs/tempfs.py b/fs/tempfs.py
index 380b76f..d1af95e 100644
--- a/fs/tempfs.py
+++ b/fs/tempfs.py
@@ -56,14 +56,20 @@ class TempFS(OSFS):
     def __unicode__(self):
         return u'<TempFS: %s>' % self._temp_dir
     
-    def __setstate__(self, state):
-        """Pickle the TempFS. TempFS delted their contents when closed, so pickling
-        is not garanteed to preserve the directory contents"""
-        state = super(TempFS, self).__setstate__(state)        
-        self._temp_dir = tempfile.mkdtemp(self.identifier or "TempFS", dir=self.temp_dir)  
-        super(TempFS, self).__init__(self._temp_dir,
-                                     dir_mode=self.dir_mode,
-                                     thread_synchronize=self.thread_synchronize)      
+    def __getstate__(self):
+        # If we are picking a TempFS, we want to preserve its contents,
+        # so we *don't* do the clean
+        state = super(TempFS, self).__getstate__()
+        self._cleaned = True
+        return state
+    
+    def __setstate__(self, state):        
+        state = super(TempFS, self).__setstate__(state)  
+        self._cleaned = False      
+        #self._temp_dir = tempfile.mkdtemp(self.identifier or "TempFS", dir=self.temp_dir)  
+        #super(TempFS, self).__init__(self._temp_dir,
+        #                             dir_mode=self.dir_mode,
+        #                             thread_synchronize=self.thread_synchronize)      
 
     def close(self):
         """Removes the temporary directory.