[Checkins] SVN: grok/trunk/s Update to the new martian API and update the dependency requirements.

[Jan-Wijbrand Kolman]

Log message for revision 80481:
  Update to the new martian API and update the dependency requirements.
  
  

Changed:
  U   grok/trunk/setup.py
  U   grok/trunk/src/grok/_grok.py

-=-
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2007-10-02 12:12:42 UTC (rev 80480)
+++ grok/trunk/setup.py	2007-10-02 12:27:51 UTC (rev 80481)
@@ -42,7 +42,7 @@
     include_package_data = True,
     zip_safe=False,
     install_requires=['setuptools',
-                      'martian',
+                      'martian>=0.9',
                       'simplejson',
                       'pytz',
                       'ZODB3 == 3.8.0b2',

Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py	2007-10-02 12:12:42 UTC (rev 80480)
+++ grok/trunk/src/grok/_grok.py	2007-10-02 12:27:51 UTC (rev 80481)
@@ -72,13 +72,16 @@
 from zope.testing.cleanup import addCleanUp
 addCleanUp(resetBootstrap)
 
+def skip_tests(name):
+    return name in ['tests', 'ftests']
 
 def do_grok(dotted_name):
     global _bootstrapped
     if not _bootstrapped:
         bootstrap()
         _bootstrapped = True
-    martian.grok_dotted_name(dotted_name, the_module_grokker)
+    martian.grok_dotted_name(
+        dotted_name, the_module_grokker, exclude_filter=skip_tests)
 
 def grok_component(name, component,
                    context=None, module_info=None, templates=None):
@@ -88,7 +91,8 @@
                                   templates=templates)
 
 def prepare_grok(name, module, kw):
-    module_info = scan.module_info_from_module(module)
+    module_info = scan.module_info_from_module(
+        module, exclude_filter=skip_tests)
 
     # XXX hardcoded in here which base classes are possible contexts
     # this should be made extensible