remove registration of AttributeAnnotations as a view

zopefoundation · Mar 18, 2013 · f31303b · f31303b
1 parent 2198a62
commit f31303b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,11 +2,10 @@
 CHANGES
 =======
 
-4.1.1 (unreleased)
+4.2.0 (2013-03-18)
 ------------------
 
-- Nothing changed yet.
-
+- Don't make AttributeAnnotations available as a view.
 
 4.1.0 (2013-02-24)
 ------------------

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@ def alltests():
 
 setup(
     name='zope.annotation',
-    version='4.1.1.dev0',
+    version='4.2.0',
     url='http://pypi.python.org/pypi/zope.annotation',
     license='ZPL 2.1',
     description='Object annotation mechanism',

diff --git a/src/zope/annotation/configure.zcml b/src/zope/annotation/configure.zcml
@@ -8,10 +8,4 @@
       factory=".attribute.AttributeAnnotations"
       />
 
-  <adapter
-      for=".interfaces.IAttributeAnnotatable *"
-      provides=".interfaces.IAnnotations"
-      factory=".attribute.AttributeAnnotations"
-      />
-
 </configure>
diff --git a/src/zope/annotation/tests/test_configure.py b/src/zope/annotation/tests/test_configure.py
@@ -36,7 +36,7 @@ def test_configure_should_register_n_components(self):
         zope.configuration.xmlconfig.XMLConfig(
             'configure.zcml', zope.annotation)()
         self.assertEqual(u_count + 2, len(list(gsm.registeredUtilities())))
-        self.assertEqual(a_count + 2, len(list(gsm.registeredAdapters())))
+        self.assertEqual(a_count + 1, len(list(gsm.registeredAdapters())))
         self.assertEqual(
             s_count, len(list(gsm.registeredSubscriptionAdapters())))
         self.assertEqual(h_count, len(list(gsm.registeredHandlers())))