[Checkins] SVN: grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/ Move check_provides_one to martian.

Philipp von Weitershausen philikon at philikon.de
Sun May 4 06:51:53 EDT 2008


Log message for revision 86333:
  Move check_provides_one to martian.

Changed:
  U   grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/meta.py
  U   grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/util.py

-=-
Modified: grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/meta.py
===================================================================
--- grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/meta.py	2008-05-04 10:51:20 UTC (rev 86332)
+++ grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/meta.py	2008-05-04 10:51:52 UTC (rev 86333)
@@ -22,7 +22,6 @@
 from grokcore.component.util import check_adapts
 from grokcore.component.util import check_module_component
 from grokcore.component.util import determine_module_component
-from grokcore.component.util import check_provides_one
 from grokcore.component import directive
 
 def get_context(factory, module_info):
@@ -99,7 +98,7 @@
         if direct:
             obj = factory
             if provides is None:
-                check_provides_one(factory)
+                martian.util.check_provides_one(factory)
                 provides = list(interface.providedBy(factory))[0]
         else:
             obj = factory()
@@ -147,7 +146,7 @@
             if info.direct:
                 obj = info.factory
                 if provides is None:
-                    check_provides_one(obj)
+                    martian.util.check_provides_one(obj)
                     provides = list(interface.providedBy(obj))[0]
             else:
                 obj = info.factory()

Modified: grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/util.py
===================================================================
--- grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/util.py	2008-05-04 10:51:20 UTC (rev 86332)
+++ grokcore.component/branches/jw-philipp-using-ndir-directives/src/grokcore/component/util.py	2008-05-04 10:51:52 UTC (rev 86333)
@@ -88,15 +88,3 @@
     if module_component is not None:
         component = module_component
     return component
-
-
-def check_provides_one(obj):
-    provides = list(interface.providedBy(obj))
-    if len(provides) < 1:
-        raise GrokError("%r must provide at least one interface "
-                        "(use zope.interface.classProvides to specify)."
-                        % obj, obj)
-    if len(provides) > 1:
-        raise GrokError("%r provides more than one interface "
-                        "(use grok.provides to specify which one to use)."
-                        % obj, obj)



More information about the Checkins mailing list