[Zope-Checkins] CVS: Zope/lib/python/AccessControl - ZopeGuards.py:1.12

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv3312

Modified Files:
	ZopeGuards.py 
Log Message:
When converting Unauthorized to ImportError, include the Unauthorized error
in the error value.  It may provide extra info.


=== Zope/lib/python/AccessControl/ZopeGuards.py 1.11 => 1.12 ===
--- Zope/lib/python/AccessControl/ZopeGuards.py:1.11	Wed Aug 14 17:29:07 2002
+++ Zope/lib/python/AccessControl/ZopeGuards.py	Wed Aug 21 15:47:09 2002
@@ -145,9 +145,9 @@
                     raise Unauthorized
             else:
                 return __import__(mname, globals, locals, fromlist)
-        except Unauthorized:
-            raise ImportError, ('import of "%s" from "%s" is unauthorized'
-                                % (name, mname))
+        except Unauthorized, why:
+            raise ImportError, ('import of "%s" from "%s" is unauthorized. %s'
+                                % (name, mname, why))
     raise ImportError, 'import of "%s" is unauthorized' % mname
 safe_builtins['__import__'] = guarded_import