[Zope-Checkins] CVS: Zope3/lib/python/Zope/Configuration - xmlconfig.py:1.1.2.15

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/Configuration
In directory cvs.zope.org:/tmp/cvs-serv17050/lib/python/Zope/Configuration

Modified Files:
      Tag: Zope-3x-branch
	xmlconfig.py 
Log Message:
HOTYB: Merged SecurityProxy-branch into main branch.  

All tests pass and folders can be listed and added through the web.
It is likely that most other things don't work and will need to be
fixed. The reason is that many accesses that should have been checked
before are now being checked and additional checks and thinking about
permissions and security settings are needed.

I'm in the process of drafting a paper for the wiki that describes the
changes in more detail.


=== Zope3/lib/python/Zope/Configuration/xmlconfig.py 1.1.2.14 => 1.1.2.15 ===
         if len(stack) == 1:
             try:
-                stack.append(begin(self.__directives, name, self.__context, **kw))
+                stack.append(begin(self.__directives, name, self.__context,
+                                   **kw))
             except Exception, v:
                 __traceback_supplement__ = (
                     ConfigurationTracebackSupplement, self.__locator, v
@@ -232,8 +233,10 @@
                 # will have more than one element. Also, we could
                 # use package.__file__, and lop the tail off that.
                 prefix = package.__path__[0]
-            except (ImportError, AttributeError, ValueError):
-                raise ValueError, "Invalid package attribute: %s" % package
+            except (ImportError, AttributeError, ValueError), v:
+                raise # XXX the raise below hides the real error
+                raise ValueError("Invalid package attribute: %s\n(%s)"
+                                 % (package, `v`))
         else:
             prefix = os.path.dirname(self._stack[-1])