Replace the use of grok.implements() with the @grok.implementer()…

… directive throughout.
zopefoundation · Jan 17, 2018 · 6500c1d · 6500c1d
1 parent 482e77e
commit 6500c1d
Show file tree

Hide file tree

Showing 26 changed files with 71 additions and 47 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,8 +4,8 @@ Grok changes
 3.0.1 (unreleased)
 ==================
 
-- Nothing changed yet.
-
+- Replace the use of `grok.implements()` with the `@grok.implementer()`
+  directive throughout.
 
 3.0.0 (2018-01-16)
 ==================

diff --git a/src/grok/ftests/catalog/addform.py b/src/grok/ftests/catalog/addform.py
@@ -50,8 +50,9 @@ class IMammoth(interface.Interface):
     name = schema.TextLine(title=u"Name")
     size = schema.TextLine(title=u"Size")
 
+@grok.implementer(IMammoth)
 class Mammoth(grok.Model):
-    grok.implements(IMammoth)
+    pass
 
 class Index(grok.View):
     grok.context(Mammoth)

diff --git a/src/grok/ftests/forms/forms.py b/src/grok/ftests/forms/forms.py
@@ -171,8 +171,8 @@ class ICowProperties(interface.Interface):
     color = schema.TextLine(title=u"Color")
 
 
+@grok.implementer(ICowProperties)
 class Cow(grok.Context):
-    grok.implements(ICowProperties)
     color = u"globally dark"
 
 

diff --git a/src/grok/ftests/url/application.py b/src/grok/ftests/url/application.py
@@ -67,14 +67,17 @@ class Second(grok.View):
     def render(self):
         return self.application_url('second')
 
+@grok.implementer(IMarker)
 class Cave(grok.Application, grok.Container):
-    grok.implements(IMarker)
+    pass
 
+@grok.implementer(IMarker)
 class CaveMan(grok.Model):
-    grok.implements(IMarker)
+    pass
 
+@grok.implementer(IMarker)
 class Corridors(grok.Container):
-    grok.implements(IMarker)
+    pass
 
 class IMammothSkin(IDefaultBrowserLayer):
     grok.skin('mammothskin')

diff --git a/src/grok/tests/adapter/adapter.py b/src/grok/tests/adapter/adapter.py
@@ -25,12 +25,13 @@ class Cave(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
 
 class IFireplace(interface.Interface):
     pass
 
+@grok.implementer(IFireplace, IHome)
 class Fireplace(grok.Adapter):
-    grok.implements(IFireplace, IHome)
     grok.provides(IFireplace)
diff --git a/src/grok/tests/adapter/adapterdecorator.py b/src/grok/tests/adapter/adapterdecorator.py
@@ -49,12 +49,13 @@ class IMoreHome(interface.Interface):
 class IYetAnotherHome(interface.Interface):
     pass
 
+@grok.implementer(ICave)
 class Cave(grok.Model):
-    grok.implements(ICave)
     pass
 
+@grok.implementer(IHome)
 class Home(object):
-    grok.implements(IHome)
+    pass
 
 @grok.adapter(Cave)
 @grok.implementer(IHome)

diff --git a/src/grok/tests/adapter/alphabetical.py b/src/grok/tests/adapter/alphabetical.py
@@ -22,5 +22,6 @@ class ZCave(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/classcontext.py b/src/grok/tests/adapter/classcontext.py
@@ -24,6 +24,6 @@ class Club(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
     grok.context(Cave)
diff --git a/src/grok/tests/adapter/classcontextimported.py b/src/grok/tests/adapter/classcontextimported.py
@@ -19,6 +19,6 @@
 class IPainting(interface.Interface):
     pass
 
+@grok.implementer(IPainting)
 class Painting(grok.Adapter):
-    grok.implements(IPainting)
     grok.context(Cave)
diff --git a/src/grok/tests/adapter/implementsmany.py b/src/grok/tests/adapter/implementsmany.py
@@ -21,5 +21,6 @@ class IHome(interface.Interface):
 class IFireplace(interface.Interface):
     pass
 
+@grok.implementer(IHome, IFireplace)
 class Home(grok.Adapter):
-    grok.implements(IHome, IFireplace)
+    pass
diff --git a/src/grok/tests/adapter/importedmodel2.py b/src/grok/tests/adapter/importedmodel2.py
@@ -16,9 +16,9 @@
 class IPainting(interface.Interface):
     pass
 
+@grok.implementer(IPainting)
 class Painting(grok.Adapter):
     """
     Grokking of this should fail because there's no model (only an
     imported one which doesn't count).
     """
-    grok.implements(IPainting)
diff --git a/src/grok/tests/adapter/interface.py b/src/grok/tests/adapter/interface.py
@@ -27,15 +27,17 @@
 class ICave(interface.Interface):
     pass
 
+@grok.implementer(ICave)
 class Cave(grok.Model):
-    grok.implements(ICave)
+    pass
 
+@grok.implementer(ICave)
 class Hole(grok.Model):
-    grok.implements(ICave)
+    pass
 
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
     grok.context(ICave)
diff --git a/src/grok/tests/adapter/interfacemodule.py b/src/grok/tests/adapter/interfacemodule.py
@@ -27,16 +27,19 @@
 class ICave(interface.Interface):
     pass
 
+@grok.implementer(ICave)
 class Cave(grok.Model):
-    grok.implements(ICave)
+    pass
 
+@grok.implementer(ICave)
 class Hole(grok.Model):
-    grok.implements(ICave)
+    pass
 
 grok.context(ICave)
 
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/modulecontext.py b/src/grok/tests/adapter/modulecontext.py
@@ -26,5 +26,6 @@ class Club(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/modulecontextimported.py b/src/grok/tests/adapter/modulecontextimported.py
@@ -21,5 +21,6 @@
 class IPainting(interface.Interface):
     pass
 
+@grok.implementer(IPainting)
 class Painting(grok.Adapter):
-    grok.implements(IPainting)
+    pass
diff --git a/src/grok/tests/adapter/multiadapter.py b/src/grok/tests/adapter/multiadapter.py
@@ -60,17 +60,17 @@ class Fireplace(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.MultiAdapter):
     grok.adapts(Cave, Fireplace)
-    grok.implements(IHome)
 
     def __init__(self, cave, fireplace):
         self.cave = cave
         self.fireplace = fireplace
 
+@grok.implementer(IHome)
 class Home2(grok.MultiAdapter):
     grok.adapts(Cave, Fireplace)
-    grok.implements(IHome)
     grok.name('home2')
 
     def __init__(self, cave, fireplace):
@@ -80,9 +80,9 @@ def __init__(self, cave, fireplace):
 class IFireplace(interface.Interface):
     pass
 
+@grok.implementer(IHome, IFireplace)
 class Home3(grok.MultiAdapter):
     grok.adapts(Cave, Fireplace)
-    grok.implements(IHome, IFireplace)
     grok.provides(IHome)
     grok.name('home3')
 

diff --git a/src/grok/tests/adapter/multiadaptsnone.py b/src/grok/tests/adapter/multiadaptsnone.py
@@ -14,5 +14,6 @@
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.MultiAdapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/multiple.py b/src/grok/tests/adapter/multiple.py
@@ -19,5 +19,6 @@ class Club(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/namedadapter.py b/src/grok/tests/adapter/namedadapter.py
@@ -26,6 +26,6 @@ class Cave(grok.Model):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
     grok.name('home')
diff --git a/src/grok/tests/adapter/nomodel.py b/src/grok/tests/adapter/nomodel.py
@@ -13,5 +13,6 @@
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
diff --git a/src/grok/tests/adapter/oldstyleclass.py b/src/grok/tests/adapter/oldstyleclass.py
@@ -20,6 +20,6 @@ class Cave:
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
     grok.context(Cave)
diff --git a/src/grok/tests/adapter/order.py b/src/grok/tests/adapter/order.py
@@ -19,8 +19,9 @@
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IHome)
 class Home(grok.Adapter):
-    grok.implements(IHome)
+    pass
 
 class Cave(grok.Model):
     pass
diff --git a/src/grok/tests/directive/multipletimes.py b/src/grok/tests/directive/multipletimes.py
@@ -36,11 +36,13 @@ class IClub(interface.Interface):
 class ICave(interface.Interface):
     pass
 
+@grok.implementer(IClub)
 class Club(object):
-    grok.implements(IClub)
+    pass
 
+@grok.implementer(ICave)
 class Cave(object):
-    grok.implements(ICave)
+    pass
 
 grok.global_utility(Club, provides=IClub, name='foo')
 grok.global_utility(Cave)
diff --git a/src/grok/tests/utility/implementsmany.py b/src/grok/tests/utility/implementsmany.py
@@ -16,5 +16,6 @@ class IClub(interface.Interface):
 class ISpikyClub(interface.Interface):
     pass
 
+@grok.implementer(IClub, ISpikyClub)
 class Club(grok.GlobalUtility):
-    grok.implements(IClub, ISpikyClub)
+    pass
diff --git a/src/grok/tests/utility/implementsmany2.py b/src/grok/tests/utility/implementsmany2.py
@@ -16,8 +16,8 @@ class IClub(interface.Interface):
 class ISpikyClub(interface.Interface):
     pass
 
+@grok.implementer(IClub, ISpikyClub)
 class Club(object):
-    grok.implements(IClub, ISpikyClub)
+    pass
 
 grok.global_utility(Club)
-
diff --git a/src/grok/tests/utility/utility.py b/src/grok/tests/utility/utility.py
@@ -145,31 +145,31 @@ class INightClub(interface.Interface):
 class IClubMaker(interface.Interface):
     pass
 
+@grok.implementer(IClub)
 class NormalClub(grok.GlobalUtility):
-    grok.implements(IClub)
+    pass
 
+@grok.implementer(IClub)
 class HugeClub(grok.GlobalUtility):
-    grok.implements(IClub)
     grok.name('huge')
 
+@grok.implementer(ISpikyClub)
 class SpikyClub(grok.GlobalUtility):
-    grok.implements(ISpikyClub)
     grok.provides(IClub)
     grok.name('spiky')
 
+@grok.implementer(INightClub, ISpikyClub)
 class NightClub(grok.GlobalUtility):
-    grok.implements(INightClub, ISpikyClub)
     grok.provides(INightClub)
 
+@grok.implementer(ISmallClub, ITinyClub)
 class SmallClub(grok.GlobalUtility):
-    grok.implements(ISmallClub, ITinyClub)
     grok.provides(ISmallClub)
     grok.name('tiny')
 
-
 @interface.provider(IClubMaker)
+@grok.implementer(IClub)
 class ClubMaker(grok.GlobalUtility):
-    grok.implements(IClub)
     grok.direct()
     grok.name('maker')
 
@@ -179,11 +179,13 @@ class IFireplace(interface.Interface):
 class IHome(interface.Interface):
     pass
 
+@grok.implementer(IFireplace)
 class Fireplace(object):
-    grok.implements(IFireplace)
+    pass
 
+@grok.implementer(IFireplace, IHome)
 class Home(object):
-    grok.implements(IFireplace, IHome)
+    pass
 
 grok.global_utility(Fireplace)
 grok.global_utility(Fireplace, name='hot')