[Checkins] SVN: grok/branches/brandon-grokcore.component/src/grok/ Switched grok over to using the grokcore.component classes for

[Brandon Rhodes]

Log message for revision 84789:
  Switched grok over to using the grokcore.component classes for
  adapters (but the tests still run because grok is still using its own
  grokkers, in meta.py).
  

Changed:
  U   grok/branches/brandon-grokcore.component/src/grok/__init__.py
  U   grok/branches/brandon-grokcore.component/src/grok/components.py

-=-
Modified: grok/branches/brandon-grokcore.component/src/grok/__init__.py
===================================================================
--- grok/branches/brandon-grokcore.component/src/grok/__init__.py	2008-03-19 17:29:44 UTC (rev 84788)
+++ grok/branches/brandon-grokcore.component/src/grok/__init__.py	2008-03-19 17:52:17 UTC (rev 84789)
@@ -30,10 +30,11 @@
     IContainerModifiedEvent, ContainerModifiedEvent)
 
 from martian import ClassGrokker, InstanceGrokker, GlobalGrokker
-from grok.components import Model, Adapter, MultiAdapter, View
+from grokcore.component import Adapter, MultiAdapter, GlobalUtility
+from grok.components import Model, View
 from grok.components import XMLRPC, REST, JSON
 from grok.components import PageTemplate, PageTemplateFile, Container, Traverser
-from grok.components import Site, GlobalUtility, LocalUtility, Annotation
+from grok.components import Site, LocalUtility, Annotation
 from grok.components import Application, Form, AddForm, EditForm, DisplayForm
 from grok.components import Indexes
 from grok.components import Permission, Role

Modified: grok/branches/brandon-grokcore.component/src/grok/components.py
===================================================================
--- grok/branches/brandon-grokcore.component/src/grok/components.py	2008-03-19 17:29:44 UTC (rev 84788)
+++ grok/branches/brandon-grokcore.component/src/grok/components.py	2008-03-19 17:52:17 UTC (rev 84789)
@@ -84,24 +84,10 @@
     interface.implements(interfaces.IApplication)
 
 
-class Adapter(object):
-
-    def __init__(self, context):
-        self.context = context
-
-
-class GlobalUtility(object):
-    pass
-
-
 class LocalUtility(Model):
     pass
 
 
-class MultiAdapter(object):
-    pass
-
-
 class Annotation(persistent.Persistent):
     pass