[Checkins] SVN: grokcore.component/trunk/src/grok/ Rewrote the
tests so that "Model" became "Context", since in the realm
Brandon Rhodes
brandon at rhodesmill.org
Mon Mar 17 17:29:07 EDT 2008
Log message for revision 84752:
Rewrote the tests so that "Model" became "Context", since in the realm
of grokcore.component, the only purpose of the class is to mark things
that are eligible to be considered the "default context" of the module
they appear in. Later, "grok.Model" and "grok.Container" can inherit
from this class.
Changed:
U grokcore.component/trunk/src/grok/__init__.py
U grokcore.component/trunk/src/grok/tests/adapter/adapter.py
U grokcore.component/trunk/src/grok/tests/adapter/adapterdecorator.py
U grokcore.component/trunk/src/grok/tests/adapter/alphabetical.py
U grokcore.component/trunk/src/grok/tests/adapter/classcontext.py
U grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple_fixture.py
U grokcore.component/trunk/src/grok/tests/adapter/implementsmany.py
U grokcore.component/trunk/src/grok/tests/adapter/implementsnone.py
U grokcore.component/trunk/src/grok/tests/adapter/implementsnonemulti.py
U grokcore.component/trunk/src/grok/tests/adapter/interface.py
U grokcore.component/trunk/src/grok/tests/adapter/interfacemodule.py
U grokcore.component/trunk/src/grok/tests/adapter/modulecontext.py
U grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple_fixture.py
U grokcore.component/trunk/src/grok/tests/adapter/multiadapter.py
U grokcore.component/trunk/src/grok/tests/adapter/multiple.py
U grokcore.component/trunk/src/grok/tests/adapter/namedadapter.py
U grokcore.component/trunk/src/grok/tests/adapter/order.py
-=-
Modified: grokcore.component/trunk/src/grok/__init__.py
===================================================================
--- grokcore.component/trunk/src/grok/__init__.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/__init__.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -19,7 +19,6 @@
from martian import ClassGrokker, InstanceGrokker, GlobalGrokker
from grok.components import Adapter, GlobalUtility, MultiAdapter, Context
-from grok.components import Context as Model
from grok.directive import (context, name, title,
provides, baseclass, global_utility,
Modified: grokcore.component/trunk/src/grok/tests/adapter/adapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/adapter.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/adapter.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -19,7 +19,7 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/adapterdecorator.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/adapterdecorator.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/adapterdecorator.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -49,7 +49,7 @@
class IYetAnotherHome(interface.Interface):
pass
-class Cave(grok.Model):
+class Cave(grok.Context):
grok.implements(ICave)
pass
Modified: grokcore.component/trunk/src/grok/tests/adapter/alphabetical.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/alphabetical.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/alphabetical.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -15,7 +15,7 @@
import grok
from zope import interface
-class ZCave(grok.Model):
+class ZCave(grok.Context):
"""we call this `ZCave` because we want to test that we do not
depend on alphabetical order"""
Modified: grokcore.component/trunk/src/grok/tests/adapter/classcontext.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontext.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/classcontext.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -15,10 +15,10 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Club(grok.Model):
+class Club(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple_fixture.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/classcontextmultiple_fixture.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -1,9 +1,9 @@
import grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Club(grok.Model):
+class Club(grok.Context):
pass
class Anything(object):
Modified: grokcore.component/trunk/src/grok/tests/adapter/implementsmany.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsmany.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/implementsmany.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -12,7 +12,7 @@
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/implementsnone.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsnone.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/implementsnone.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -10,7 +10,7 @@
"""
import grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class Home(grok.Adapter):
Modified: grokcore.component/trunk/src/grok/tests/adapter/implementsnonemulti.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/implementsnonemulti.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/implementsnonemulti.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -10,7 +10,7 @@
"""
import grok
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class Home(grok.MultiAdapter):
Modified: grokcore.component/trunk/src/grok/tests/adapter/interface.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/interface.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/interface.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -27,10 +27,10 @@
class ICave(interface.Interface):
pass
-class Cave(grok.Model):
+class Cave(grok.Context):
grok.implements(ICave)
-class Hole(grok.Model):
+class Hole(grok.Context):
grok.implements(ICave)
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/interfacemodule.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/interfacemodule.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/interfacemodule.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -27,10 +27,10 @@
class ICave(interface.Interface):
pass
-class Cave(grok.Model):
+class Cave(grok.Context):
grok.implements(ICave)
-class Hole(grok.Model):
+class Hole(grok.Context):
grok.implements(ICave)
grok.context(ICave)
Modified: grokcore.component/trunk/src/grok/tests/adapter/modulecontext.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontext.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/modulecontext.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -15,10 +15,10 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Club(grok.Model):
+class Club(grok.Context):
pass
grok.context(Cave)
Modified: grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple_fixture.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple_fixture.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/modulecontextmultiple_fixture.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -1,10 +1,10 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Club(grok.Model):
+class Club(grok.Context):
pass
grok.context(Cave)
Modified: grokcore.component/trunk/src/grok/tests/adapter/multiadapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/multiadapter.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/multiadapter.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -51,10 +51,10 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Fireplace(grok.Model):
+class Fireplace(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/multiple.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/multiple.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/multiple.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -11,10 +11,10 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
-class Club(grok.Model):
+class Club(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/namedadapter.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/namedadapter.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/namedadapter.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -20,7 +20,7 @@
import grok
from zope import interface
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
class IHome(interface.Interface):
Modified: grokcore.component/trunk/src/grok/tests/adapter/order.py
===================================================================
--- grokcore.component/trunk/src/grok/tests/adapter/order.py 2008-03-17 21:28:55 UTC (rev 84751)
+++ grokcore.component/trunk/src/grok/tests/adapter/order.py 2008-03-17 21:29:07 UTC (rev 84752)
@@ -22,5 +22,5 @@
class Home(grok.Adapter):
grok.implements(IHome)
-class Cave(grok.Model):
+class Cave(grok.Context):
pass
More information about the Checkins
mailing list