[Zope3-checkins] CVS: Zope3/lib/python/Zope/Server/VFS - OSFileSystem.py:1.3
Steve Alexander
steve@cat-box.net
Mon, 11 Nov 2002 09:36:04 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/Server/VFS
In directory cvs.zope.org:/tmp/cvs-serv6614/lib/python/Zope/Server/VFS
Modified Files:
OSFileSystem.py
Log Message:
removed bare except:
=== Zope3/lib/python/Zope/Server/VFS/OSFileSystem.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/Server/VFS/OSFileSystem.py:1.2 Mon Jun 10 19:29:37 2002
+++ Zope3/lib/python/Zope/Server/VFS/OSFileSystem.py Mon Nov 11 09:36:04 2002
@@ -18,7 +18,6 @@
import os
import re
import stat
-import time
import fnmatch
from IPosixFileSystem import IPosixFileSystem
@@ -198,7 +197,7 @@
# utility methods
- def normalize (self, path):
+ def normalize(self, path):
# watch for the ever-sneaky '/+' path element
# XXX It is unclear why "/+" is dangerous. It is definitely
# unexpected.
@@ -211,7 +210,7 @@
return path
- def translate (self, path):
+ def translate(self, path):
"""We need to join together three separate path components,
and do it safely. <real_root>/<path>
use the operating system's path separator.
@@ -228,13 +227,13 @@
return os.path.join(self.root, path)
- def __repr__ (self):
+ def __repr__(self):
return '<OSFileSystem, root=%s>' % self.root
-def safe_stat (path):
+def safe_stat(path):
try:
return os.stat(path)
- except:
+ except OSError:
return None