[Checkins] SVN: five.grok/trunk/src/five/grok/ Move the components from grok.grok to grok.

[Lennart Regebro]

Log message for revision 85747:
  Move the components from grok.grok to grok.
  

Changed:
  U   five.grok/trunk/src/five/grok/__init__.py
  D   five.grok/trunk/src/five/grok/grok.py
  U   five.grok/trunk/src/five/grok/meta.py
  U   five.grok/trunk/src/five/grok/tests/adapters.py
  U   five.grok/trunk/src/five/grok/tests/utilities.py
  U   five.grok/trunk/src/five/grok/tests/views.py

-=-
Modified: five.grok/trunk/src/five/grok/__init__.py
===================================================================
--- five.grok/trunk/src/five/grok/__init__.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/__init__.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -1 +1,6 @@
-#
+# Import adapter and utility support from grokcore.component.
+from grokcore.component.components import GlobalUtility, Adapter
+from grokcore.component.directive import name, provides, context
+from zope.interface import implements
+
+from components import View

Deleted: five.grok/trunk/src/five/grok/grok.py
===================================================================
--- five.grok/trunk/src/five/grok/grok.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/grok.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -1,6 +0,0 @@
-# Import adapter and utility support from grokcore.component.
-from grokcore.component.components import GlobalUtility, Adapter
-from grokcore.component.directive import name, provides, context
-from zope.interface import implements
-
-from components import View

Modified: five.grok/trunk/src/five/grok/meta.py
===================================================================
--- five.grok/trunk/src/five/grok/meta.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/meta.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -1,7 +1,7 @@
 import martian
 from martian import util
 from zope import interface, component
-from five.grok import grok
+from five import grok
 from five.grok.util import get_default_permission, make_checker
 from grokcore.component.meta import get_context, get_name_classname
 from grokcore.component.util import determine_class_directive

Modified: five.grok/trunk/src/five/grok/tests/adapters.py
===================================================================
--- five.grok/trunk/src/five/grok/tests/adapters.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/tests/adapters.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -8,7 +8,7 @@
 
 """
 from zope.interface import Interface
-from five.grok import grok
+from five import grok
 from OFS.interfaces import ISimpleItem
 
 class IId(Interface):

Modified: five.grok/trunk/src/five/grok/tests/utilities.py
===================================================================
--- five.grok/trunk/src/five/grok/tests/utilities.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/tests/utilities.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -9,7 +9,7 @@
 
 """
 from zope.interface import Interface, implements
-from five.grok import grok
+from five import grok
 
 class IFiveClub(Interface):
     pass

Modified: five.grok/trunk/src/five/grok/tests/views.py
===================================================================
--- five.grok/trunk/src/five/grok/tests/views.py	2008-04-26 08:56:56 UTC (rev 85746)
+++ five.grok/trunk/src/five/grok/tests/views.py	2008-04-26 09:00:53 UTC (rev 85747)
@@ -16,7 +16,7 @@
   'item'
 
 """
-from five.grok import grok
+from five import grok
 from OFS.interfaces import ISimpleItem
 
 class SimpleItemView(grok.View):