[Checkins] SVN: grokcore.site/trunk/ A local utility is now IAttributeAnnotatable.

Sylvain Viollon sylvain at infrae.com
Fri Sep 18 07:41:35 EDT 2009


Log message for revision 104299:
  A local utility is now IAttributeAnnotatable.
  
  

Changed:
  U   grokcore.site/trunk/CHANGES.txt
  U   grokcore.site/trunk/setup.py
  U   grokcore.site/trunk/src/grokcore/site/components.py
  U   grokcore.site/trunk/src/grokcore/site/meta.py

-=-
Modified: grokcore.site/trunk/CHANGES.txt
===================================================================
--- grokcore.site/trunk/CHANGES.txt	2009-09-18 11:40:14 UTC (rev 104298)
+++ grokcore.site/trunk/CHANGES.txt	2009-09-18 11:41:34 UTC (rev 104299)
@@ -1,9 +1,11 @@
 Changes
 =======
 
-1.0.2 (unreleased)
-------------------
+1.1 (unreleased)
+----------------
 
+* A local utility implements now IAttributeAnnotatable.
+
 * Update code documentation from Grok itself.
 
 * Use 1.0b2 versions.cfg in Grok's release info instead of a local

Modified: grokcore.site/trunk/setup.py
===================================================================
--- grokcore.site/trunk/setup.py	2009-09-18 11:40:14 UTC (rev 104298)
+++ grokcore.site/trunk/setup.py	2009-09-18 11:41:34 UTC (rev 104299)
@@ -12,7 +12,7 @@
 
 setup(
     name='grokcore.site',
-    version='1.0.2dev',
+    version='1.1dev',
     author='Grok Team',
     author_email='grok-dev at zope.org',
     url='http://grok.zope.org',
@@ -35,6 +35,7 @@
     install_requires=['setuptools',
                       'martian',
                       'ZODB3',
+                      'zope.annotation',
                       'zope.component',
                       'zope.interface',
                       'zope.app.component',

Modified: grokcore.site/trunk/src/grokcore/site/components.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/components.py	2009-09-18 11:40:14 UTC (rev 104298)
+++ grokcore.site/trunk/src/grokcore/site/components.py	2009-09-18 11:41:34 UTC (rev 104299)
@@ -17,9 +17,8 @@
 from persistent import Persistent
 
 from zope.interface import implements
-
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.component.site import SiteManagerContainer
-
 from zope.app.container.contained import Contained
 
 
@@ -61,4 +60,4 @@
     used explicitly anyway).
 
     """
-    implements(IContext)
+    implements(IContext, IAttributeAnnotatable)

Modified: grokcore.site/trunk/src/grokcore/site/meta.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/meta.py	2009-09-18 11:40:14 UTC (rev 104298)
+++ grokcore.site/trunk/src/grokcore/site/meta.py	2009-09-18 11:41:34 UTC (rev 104299)
@@ -26,6 +26,7 @@
 import grokcore.site.interfaces
 
 class SiteGrokker(martian.ClassGrokker):
+    """Grokker for subclasses of `grokcore.site.Site`."""
     martian.component(grokcore.site.components.BaseSite)
     martian.priority(500)
     martian.directive(grokcore.site.local_utility, name='infos')
@@ -63,7 +64,8 @@
     if installed:
         return
 
-    setupUtility = component.getUtility(grokcore.site.interfaces.IUtilityInstaller)
+    setupUtility = component.getUtility(
+        grokcore.site.interfaces.IUtilityInstaller)
     for info in getattr(site.__class__, '__grok_utilities_to_install__', []):
         setupUtility(site, info.factory(), info.provides, name=info.name,
                      name_in_container=info.name_in_container,
@@ -75,7 +77,7 @@
 
 
 @grokcore.component.provider(grokcore.site.interfaces.IUtilityInstaller)
-def setupUtility(site, utility, provides, name=u'',
+def setupUtility(Site, utility, provides, name=u'',
                  name_in_container=None, public=False, setup=None):
     """Set up a utility in a site.
 



More information about the checkins mailing list