[Checkins] SVN: Sandbox/darrylcousins/mars.adapter/ Updating finally

[Darryl Cousins]

Log message for revision 83476:
  Updating finally

Changed:
  U   Sandbox/darrylcousins/mars.adapter/buildout.cfg
  U   Sandbox/darrylcousins/mars.adapter/src/mars/adapter/adapter.txt
  U   Sandbox/darrylcousins/mars.adapter/src/mars/adapter/tests.py

-=-
Modified: Sandbox/darrylcousins/mars.adapter/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/mars.adapter/buildout.cfg	2008-02-03 23:16:44 UTC (rev 83475)
+++ Sandbox/darrylcousins/mars.adapter/buildout.cfg	2008-02-04 03:16:22 UTC (rev 83476)
@@ -2,7 +2,11 @@
 develop = .
 parts = test
 extends = http://grok.zope.org/releaseinfo/grok-0.11.1.cfg
+versions = versions
 
+[versions]
+martian = 0.9.2
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = mars.adapter [test]

Modified: Sandbox/darrylcousins/mars.adapter/src/mars/adapter/adapter.txt
===================================================================
--- Sandbox/darrylcousins/mars.adapter/src/mars/adapter/adapter.txt	2008-02-03 23:16:44 UTC (rev 83475)
+++ Sandbox/darrylcousins/mars.adapter/src/mars/adapter/adapter.txt	2008-02-04 03:16:22 UTC (rev 83476)
@@ -65,7 +65,7 @@
 module is ``grokked`` on start up.
 
   >>> from mars.adapter.meta import AdapterFactoryGrokker
-  >>> AdapterFactoryGrokker().grok('unnamed', UnNamedValueAdapter, None, config)
+  >>> AdapterFactoryGrokker().grok('', UnNamedValueAdapter, None, config)
   True
   >>> config.execute_actions()
 
@@ -88,7 +88,7 @@
 
 Again we manually ``grok`` the factory.
 
-  >>> AdapterFactoryGrokker().grok('named', NamedValueAdapter, None, config)
+  >>> AdapterFactoryGrokker().grok('', NamedValueAdapter, None, config)
   True
   >>> config.execute_actions()
 

Modified: Sandbox/darrylcousins/mars.adapter/src/mars/adapter/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.adapter/src/mars/adapter/tests.py	2008-02-03 23:16:44 UTC (rev 83475)
+++ Sandbox/darrylcousins/mars.adapter/src/mars/adapter/tests.py	2008-02-04 03:16:22 UTC (rev 83476)
@@ -3,21 +3,12 @@
 from zope.testing import doctest
 from zope.configuration.config import ConfigurationMachine
 
-from martian import scan
-
 optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
 
-def setUp(test):
-    test.globs['config'] = ConfigurationMachine()
+globs = dict(config=ConfigurationMachine())
 
 def test_suite():
     return doctest.DocFileSuite(
-            'adapter.txt',
-            setUp=setUp,
+            'adapter.txt', globs=globs,
             optionflags=optionflags
             )
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-