diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-04 00:04:12 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-04 00:04:12 -0400 |
| commit | 25be339daa0448bf64b4dba03c08205b571a1cb0 (patch) | |
| tree | 64e593de7a874978d780e7dbfc1cbb20d0d5bac1 /docs/narr | |
| parent | d54b1066219cd4fca5ccaa8fc39f9c83ef355d31 (diff) | |
| download | pyramid-25be339daa0448bf64b4dba03c08205b571a1cb0.tar.gz pyramid-25be339daa0448bf64b4dba03c08205b571a1cb0.tar.bz2 pyramid-25be339daa0448bf64b4dba03c08205b571a1cb0.zip | |
remove documentation and todo mentions of zope.configuration
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/advconfig.rst | 7 |
1 files changed, 2 insertions, 5 deletions
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, <InterfaceClass pyramid.interfaces.IView>, None, None, None, None, None, False, None, None, None) |