From 25be339daa0448bf64b4dba03c08205b571a1cb0 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 4 Sep 2011 00:04:12 -0400 Subject: remove documentation and todo mentions of zope.configuration --- docs/narr/advconfig.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'docs/narr/advconfig.rst') diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst index 8040a465f..7b62b1a73 100644 --- a/docs/narr/advconfig.rst +++ b/docs/narr/advconfig.rst @@ -82,11 +82,8 @@ that ends something like this: self.commit() File "pyramid/pyramid/config.py", line 473, in commit self._ctx.execute_actions() - File "zope/configuration/config.py", line 600, in execute_actions - for action in resolveConflicts(self.actions): - File "zope/configuration/config.py", line 1507, in resolveConflicts - raise ConfigurationConflictError(conflicts) - zope.configuration.config.ConfigurationConflictError: + ... more code ... + pyramid.exceptions.ConfigurationConflictError: Conflicting configuration actions For: ('view', None, '', None, , None, None, None, None, None, False, None, None, None) -- cgit v1.2.3