grok -> scan to prevent confusion.

7 files changed, 18 insertions, 18 deletions

diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index b23529f8f..5e911fd7a 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -179,7 +179,7 @@ To make :mod:`repoze.bfg` process your ``bfg_view`` declarations, you
 *must* insert the following boilerplate into your application's
 ``configure.zcml``::
 
-  <grok package="."/>
+  <scan package="."/>
 
 After you do so, you will not need to use any other ZCML to configure
 :mod:`repoze.bfg` view declarations.  Instead, you will use a
diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
index 7ca34a5fb..89d45e0e6 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/repoze/bfg/includes/meta.zcml
@@ -11,9 +11,9 @@
         />
 
     <meta:directive
-        name="grok"
-        schema="repoze.bfg.zcml.IGrokDirective"
-        handler="repoze.bfg.zcml.grok"
+        name="scan"
+        schema="repoze.bfg.zcml.IScanDirective"
+        handler="repoze.bfg.zcml.scan"
         />
 
   </meta:directives>
diff --git a/repoze/bfg/tests/grokkedapp/configure.zcml b/repoze/bfg/tests/grokkedapp/configure.zcml
index be7226afd..6867046df 100644
--- a/repoze/bfg/tests/grokkedapp/configure.zcml
+++ b/repoze/bfg/tests/grokkedapp/configure.zcml
@@ -1,6 +1,6 @@
 <configure xmlns="http://namespaces.repoze.org/bfg">
 
   <include package="repoze.bfg.includes" />
-  <grok package="."/>
+  <scan package="."/>
 
 </configure>
diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py
index 4630f0da8..4c5777738 100644
--- a/repoze/bfg/tests/test_integration.py
+++ b/repoze/bfg/tests/test_integration.py
@@ -35,13 +35,13 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase):
         result = wsgiapptest(context, request)
         self.assertEqual(result, '123')
 
-    def test_grokkage(self):
+    def test_scanned(self):
         from repoze.bfg.interfaces import IRequest
         from repoze.bfg.interfaces import IView
-        from repoze.bfg.zcml import grok
+        from repoze.bfg.zcml import scan
         context = DummyContext()
         from repoze.bfg.tests import test_integration
-        grok(context, test_integration)
+        scan(context, test_integration)
         actions = context.actions
         self.assertEqual(len(actions), 2)
         action = actions[1]
@@ -75,13 +75,13 @@ class PushPagePlusBFGViewTests(unittest.TestCase):
         result = pushtest(context, request)
         self.assertEqual(result.status, '200 OK')
 
-    def test_grokkage(self):
+    def test_scanned(self):
         from repoze.bfg.interfaces import IRequest
         from repoze.bfg.interfaces import IView
-        from repoze.bfg.zcml import grok
+        from repoze.bfg.zcml import scan
         context = DummyContext()
         from repoze.bfg.tests import test_integration
-        grok(context, test_integration)
+        scan(context, test_integration)
         actions = context.actions
         self.assertEqual(len(actions), 2)
         action = actions[0]
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 1d7f42098..a59f88ae1 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -492,7 +492,7 @@ class TestBFGViewFunctionGrokker(unittest.TestCase):
         actions = context.actions
         self.assertEqual(len(actions), 0)
 
-class TestZCMLGrokFunction(unittest.TestCase):
+class TestZCMLScanFunction(unittest.TestCase):
     def setUp(self):
         cleanUp()
 
@@ -500,8 +500,8 @@ class TestZCMLGrokFunction(unittest.TestCase):
         cleanUp()
 
     def _callFUT(self, context, package, martian):
-        from repoze.bfg.zcml import grok
-        return grok(context, package, martian)
+        from repoze.bfg.zcml import scan
+        return scan(context, package, martian)
 
     def test_it(self):
         martian = DummyMartianModule()
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index 67c664855..0aacc0061 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -210,7 +210,7 @@ class bfg_view(object):
     To make use of bfg_view declarations, insert the following
     boilerplate into your application registry's ZCML::
     
-      <grok package="."/>
+      <scan package="."/>
     """
     def __init__(self, name='', request_type=IRequest, for_=Interface,
                permission=None):
diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py
index f1bc9eb94..42e979bcb 100644
--- a/repoze/bfg/zcml.py
+++ b/repoze/bfg/zcml.py
@@ -217,16 +217,16 @@ def exclude(name):
         return True
     return False
 
-def grok(_context, package, martian=martian):
+def scan(_context, package, martian=martian):
     # martian overrideable only for unit tests
     module_grokker = martian.ModuleGrokker()
     module_grokker.register(BFGViewFunctionGrokker())
     martian.grok_dotted_name(package.__name__, grokker=module_grokker,
                              context=_context, exclude_filter=exclude)
 
-class IGrokDirective(Interface):
+class IScanDirective(Interface):
     package = GlobalObject(
-        title=u"The package we'd like to grok.",
+        title=u"The package we'd like to scan.",
         required=True,
         )