[Checkins] SVN: grok/branches/gotcha-configuration-actions/ Use martian from my branch. It will let us get rid of the last "prepare" code that

[Philipp von Weitershausen]

Log message for revision 80785:
  Use martian from my branch.  It will let us get rid of the last "prepare" code that
  inserts module_info as a keyword argument.
  
  This concludes the work of this branch.
  

Changed:
  _U  grok/branches/gotcha-configuration-actions/
  U   grok/branches/gotcha-configuration-actions/buildout.cfg
  U   grok/branches/gotcha-configuration-actions/src/grok/_grok.py
  U   grok/branches/gotcha-configuration-actions/versions.cfg

-=-

Property changes on: grok/branches/gotcha-configuration-actions
___________________________________________________________________
Name: svn:externals
   - bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/

   + martian svn+ssh://svn.zope.org/repos/main/martian/branches/philikon-moduleinfo-kwarg
bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/


Modified: grok/branches/gotcha-configuration-actions/buildout.cfg
===================================================================
--- grok/branches/gotcha-configuration-actions/buildout.cfg	2007-10-10 12:04:07 UTC (rev 80784)
+++ grok/branches/gotcha-configuration-actions/buildout.cfg	2007-10-10 12:13:26 UTC (rev 80785)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . doc grokwiki
+develop = . doc grokwiki martian
 parts = docs grokwiki zopectl data test
 find-links = http://download.zope.org/distribution/
 extends = versions.cfg

Modified: grok/branches/gotcha-configuration-actions/src/grok/_grok.py
===================================================================
--- grok/branches/gotcha-configuration-actions/src/grok/_grok.py	2007-10-10 12:04:07 UTC (rev 80784)
+++ grok/branches/gotcha-configuration-actions/src/grok/_grok.py	2007-10-10 12:13:26 UTC (rev 80785)
@@ -80,11 +80,5 @@
         config=config
         )
 
-def prepare_grok(name, module, kw):
-    module_info = scan.module_info_from_module(
-        module, exclude_filter=skip_tests)
-    kw['module_info'] = module_info
-
 the_multi_grokker = martian.MetaMultiGrokker()
-the_module_grokker = martian.ModuleGrokker(the_multi_grokker,
-                                           prepare=prepare_grok)
+the_module_grokker = martian.ModuleGrokker(the_multi_grokker)

Modified: grok/branches/gotcha-configuration-actions/versions.cfg
===================================================================
--- grok/branches/gotcha-configuration-actions/versions.cfg	2007-10-10 12:04:07 UTC (rev 80784)
+++ grok/branches/gotcha-configuration-actions/versions.cfg	2007-10-10 12:13:26 UTC (rev 80785)
@@ -5,7 +5,7 @@
 ZODB3 = 3.8.0b2
 docutils = 0.4
 ClientForm = 0.2.7
-martian = 0.9
+#martian = 0.9
 mechanize = 0.1.7b
 pytz = 2007g
 setuptools = 0.6c7