changeset 3674:8772197c9262

fix traceback in filesys.py on Mac OS X when import Carbon fails (thanks to Uche Ogbuji for the patch)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 07 Jun 2008 17:35:22 +0200
parents bcb50d97d2ef
children f048227cabc3
files MoinMoin/util/filesys.py docs/CHANGES
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/util/filesys.py	Sat Jun 07 16:48:17 2008 +0200
+++ b/MoinMoin/util/filesys.py	Sat Jun 07 17:35:22 2008 +0200
@@ -212,8 +212,11 @@
         """
         try:
             from Carbon import File
+        except ImportError:
+            return None
+        try:
             return File.FSRef(path).as_pathname()
-        except (ImportError, File.Error):
+        except File.Error:
             return None
 
 else:
--- a/docs/CHANGES	Sat Jun 07 16:48:17 2008 +0200
+++ b/docs/CHANGES	Sat Jun 07 17:35:22 2008 +0200
@@ -30,8 +30,8 @@
 Version 1.7.0current:
 
   Bug Fixes:
-    * fix xmlrpc request.read() call to use content-length header, if available
-
+    * Fix xmlrpc request.read() call to use content-length header, if available.
+    * Fix traceback in filesys.py on Mac OS X when import Carbon fails.
 
 Version 1.7.0rc2: