[Plone-cvs] r27757 - in plone.app.linkintegrity/trunk: docs plone/app/linkintegrity

[David G. <svn...@pl...>]

Author: davisagli
Date: Wed Jul  1 07:40:08 2009
New Revision: 27757

Modified:
   plone.app.linkintegrity/trunk/docs/HISTORY.txt
   plone.app.linkintegrity/trunk/plone/app/linkintegrity/__init__.py
Log:
don't install the exception hook in Zope >=2.12

Modified: plone.app.linkintegrity/trunk/docs/HISTORY.txt
==============================================================================
--- plone.app.linkintegrity/trunk/docs/HISTORY.txt	(original)
+++ plone.app.linkintegrity/trunk/docs/HISTORY.txt	Wed Jul  1 07:40:08 2009
@@ -5,6 +5,9 @@
 
 plone.app.linkintegrity - 1.0.13 Unreleased
 
+    - Don't install the exception hook in Zope 2.12 where it is no longer
+      needed and breaks exception handling.
+      [davisagli]
 
 plone.app.linkintegrity - 1.0.12 Released June 3, 2009
 

Modified: plone.app.linkintegrity/trunk/plone/app/linkintegrity/__init__.py
==============================================================================
--- plone.app.linkintegrity/trunk/plone/app/linkintegrity/__init__.py	(original)
+++ plone.app.linkintegrity/trunk/plone/app/linkintegrity/__init__.py	Wed Jul  1 07:40:08 2009
@@ -1,6 +1,20 @@
+# test for Zope 2.12 -- the first eggified Zope
+import pkg_resources
+try:
+    dist=pkg_resources.get_distribution('Zope2')
+    HAS_ZOPE_212 = True
+except pkg_resources.DistributionNotFound:
+    HAS_ZOPE_212 = False
+
 def initialize(context):
 
-    # install the wrapper around zpublisher_exception_hook
-    from monkey import installExceptionHook
-    installExceptionHook()
+    # side effect import to patch the response's retry method
+    import monkey
 
+    # If < Zope 2.12, install the wrapper around zpublisher_exception_hook.
+    # The patch is not needed or wanted in Zope 2.12, which already includes
+    # the error view lookup in its ZPublisherExceptionHook, and which sometimes
+    # expects the error message to be returned instead of raised depending on 
+    # the response's handle_errors attribute.
+    if not HAS_ZOPE_212:
+        monkey.installExceptionHook()