[Checkins] SVN: grokcore.component/trunk/src/grokcore/component/decorators.py Cosmetic import cleanup

[Philipp von Weitershausen]

Log message for revision 88591:
  Cosmetic import cleanup
  

Changed:
  U   grokcore.component/trunk/src/grokcore/component/decorators.py

-=-
Modified: grokcore.component/trunk/src/grokcore/component/decorators.py
===================================================================
--- grokcore.component/trunk/src/grokcore/component/decorators.py	2008-07-19 14:08:12 UTC (rev 88590)
+++ grokcore.component/trunk/src/grokcore/component/decorators.py	2008-07-19 14:12:06 UTC (rev 88591)
@@ -15,8 +15,8 @@
 """
 import sys
 import types
-from zope.component._declaration import adapter as _adapter
-from zope.interface.declarations import implementer as _implementer
+import zope.component
+import zope.interface
 from martian.util import frame_is_module
 from martian.error import GrokImportError
 
@@ -41,7 +41,7 @@
         subscribers.append((function, self.subscribed))
         return function
 
-class adapter(_adapter):
+class adapter(zope.component.adapter):
 
     def __init__(self, *interfaces):
         # Override the z.c.adapter decorator to force sanity checking
@@ -52,10 +52,11 @@
         if type(interfaces[0]) is types.FunctionType:
             raise GrokImportError(
                 "@grok.adapter requires at least one argument.")
-        self.interfaces = interfaces
 
-class implementer(_implementer):
+        zope.component.adapter.__init__(self, *interfaces)
 
+class implementer(zope.interface.implementer):
+
     def __call__(self, ob):
         # XXX we do not have function grokkers (yet) so we put the annotation
         # on the module.
@@ -64,4 +65,4 @@
         if implementers is None:
             frame.f_locals['__implementers__'] = implementers = []
         implementers.append(ob)
-        return _implementer.__call__(self, ob)
+        return zope.interface.implementer.__call__(self, ob)