[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server/VFS - OSFileSystem.py:1.1.2.6

Stephan Richter srichter@cbu.edu
Wed, 3 Apr 2002 04:46:57 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/Server/VFS
In directory cvs.zope.org:/tmp/cvs-serv26049/VFS

Modified Files:
      Tag: Zope3-Server-Branch
	OSFileSystem.py 
Log Message:
More FTP server work done. It now can at least display a list of files in
a directory, however the simple FTP client in Unix still does not work.

I am getting closer though!


=== Zope3/lib/python/Zope/Server/VFS/OSFileSystem.py 1.1.2.5 => 1.1.2.6 ===
             return ListProducer (ld, 0, None)
         else:
-            old_dir = os.getcwd()
             try:
-                os.chdir (p)
                 # if os.stat fails we ignore that file.
+                j = self.path_module.join
+                ld = map(lambda x, j=j, p=p: j(p, x), ld)
                 result = filter(None, map(safe_stat, ld))
-            finally:
-                os.chdir (old_dir)
+            except:
+                # ignore
+                pass
+
             return ListProducer (result, 1, self.longify)