[Checkins] SVN: lovely.tag/branches/serverzen-z32-support/src/lovely/tag/ Fixed a few imports, zcml, etc.

[Rocky Burt]

Log message for revision 74967:
  Fixed a few imports, zcml, etc.

Changed:
  U   lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/engine.py
  U   lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/tag.py
  U   lovely.tag/branches/serverzen-z32-support/src/lovely/tag/configure.zcml

-=-
Modified: lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/engine.py
===================================================================
--- lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/engine.py	2007-05-01 16:07:47 UTC (rev 74966)
+++ lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/engine.py	2007-05-01 16:10:37 UTC (rev 74967)
@@ -17,7 +17,10 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.publisher.browser import BrowserView
+try:
+    from zope.publisher.browser import BrowserView
+except ImportError:
+    from zope.app.publisher.browser import BrowserView
 from zope import schema
 from zope.formlib import form
 from lovely.tag import _

Modified: lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/tag.py
===================================================================
--- lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/tag.py	2007-05-01 16:07:47 UTC (rev 74966)
+++ lovely.tag/branches/serverzen-z32-support/src/lovely/tag/browser/tag.py	2007-05-01 16:10:37 UTC (rev 74967)
@@ -17,7 +17,10 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.publisher.browser import BrowserView
+try:
+    from zope.publisher.browser import BrowserView
+except ImportError:
+    from zope.app.publisher.browser import BrowserView
 from zope import component, schema
 from lovely.tag.interfaces import ITaggingEngine, ITagging
 from zope.cachedescriptors.property import Lazy

Modified: lovely.tag/branches/serverzen-z32-support/src/lovely/tag/configure.zcml
===================================================================
--- lovely.tag/branches/serverzen-z32-support/src/lovely/tag/configure.zcml	2007-05-01 16:07:47 UTC (rev 74966)
+++ lovely.tag/branches/serverzen-z32-support/src/lovely/tag/configure.zcml	2007-05-01 16:10:37 UTC (rev 74967)
@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="lovely.tag">
 
   <!-- Permission declarations -->
@@ -26,8 +27,13 @@
 
   <class class=".engine.TaggingEngine">
     <implements
+        zcml:condition="installed zope.annotation"
         interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
+    <implements
+        zcml:condition="installed zope.app.annotation.tests"
+        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        />
     <require
         permission="lovely.tag.UpdateTag"
         attributes="update"