[Checkins] SVN: bobo/branches/new-manuel/b checkpoint

[Jim Fulton]

Log message for revision 102676:
  checkpoint

Changed:
  U   bobo/branches/new-manuel/bobo/setup.py
  U   bobo/branches/new-manuel/bobodoctestumentation/setup.py
  U   bobo/branches/new-manuel/bobodoctestumentation/src/bobodoctestumentation/tests.py
  U   bobo/branches/new-manuel/buildout.cfg

-=-
Modified: bobo/branches/new-manuel/bobo/setup.py
===================================================================
--- bobo/branches/new-manuel/bobo/setup.py	2009-08-11 12:50:12 UTC (rev 102675)
+++ bobo/branches/new-manuel/bobo/setup.py	2009-08-11 12:58:36 UTC (rev 102676)
@@ -53,7 +53,6 @@
     install_requires = install_requires,
     entry_points = entry_points,
     tests_require = [
-        'bobodoctestumentation >=%s, <%s.999' % (version, version),
-        'webtest', 'zope.testing'],
+        'bobodoctestumentation >=%s, <%s.999' % (version, version)],
     test_suite = 'bobodoctestumentation.tests.test_suite',
     )

Modified: bobo/branches/new-manuel/bobodoctestumentation/setup.py
===================================================================
--- bobo/branches/new-manuel/bobodoctestumentation/setup.py	2009-08-11 12:50:12 UTC (rev 102675)
+++ bobo/branches/new-manuel/bobodoctestumentation/setup.py	2009-08-11 12:58:36 UTC (rev 102676)
@@ -29,5 +29,6 @@
     packages = ['bobodoctestumentation'],
     package_dir = {'':'src'},
     package_data = {'bobodoctestumentation': ['*.txt', '*.test', '*.html']},
-    install_requires = ['manuel ==1.0.0a2', 'simplejson'],
+    install_requires = ['manuel', 'simplejson', 'webtest',
+                        'zope.testing'],
     )

Modified: bobo/branches/new-manuel/bobodoctestumentation/src/bobodoctestumentation/tests.py
===================================================================
--- bobo/branches/new-manuel/bobodoctestumentation/src/bobodoctestumentation/tests.py	2009-08-11 12:50:12 UTC (rev 102675)
+++ bobo/branches/new-manuel/bobodoctestumentation/src/bobodoctestumentation/tests.py	2009-08-11 12:58:36 UTC (rev 102676)
@@ -14,40 +14,14 @@
 
 from zope.testing import doctest, setupstack, renormalizing
 import bobo
-import manuel
+import manuel.capture
 import manuel.doctest
 import manuel.testing
-import pprint
 import re
 import sys
-import textwrap
 import types
 import unittest
-import webob
 
-def assignment_manuel():
-    assignment_re = re.compile(
-        r"[^\n]*::(?P<value>(\n| [^\n]*\n)+?)"
-        " *\.\. -> (?P<name>\w+)(?P<strip> +strip)? *\n")
-
-    m = manuel.Manuel()
-
-    @m.parser
-    def parse(document):
-        for region in document.find_regions(assignment_re):
-            data = region.start_match.groupdict()
-            data['value'] = textwrap.dedent(data['value'].expandtabs())
-            if data.get('strip'):
-                data['value'] = data['value'].strip()
-            source = "%(name)s = %(value)r\n" % data
-            example = doctest.Example(source, '', lineno=region.lineno-1)
-            document.replace_region(region, example)
-
-    m2 = manuel.doctest.Manuel()
-    m2.extend(m)
-
-    return m2
-
 def setUp(test):
     setupstack.setUpDirectory(test)
 
@@ -98,7 +72,7 @@
 def test_suite():
     return unittest.TestSuite((
         manuel.testing.TestSuite(
-            assignment_manuel(),
+            manuel.doctest.Manuel() + manuel.capture.Manuel(),
             'index.txt', 'more.txt',
             setUp=setup_intro),
         doctest.DocFileSuite(

Modified: bobo/branches/new-manuel/buildout.cfg
===================================================================
--- bobo/branches/new-manuel/buildout.cfg	2009-08-11 12:50:12 UTC (rev 102675)
+++ bobo/branches/new-manuel/buildout.cfg	2009-08-11 12:58:36 UTC (rev 102676)
@@ -4,7 +4,7 @@
 versions = versions
 
 [versions]
-manuel = 1.0.0a2
+#manuel = 1.0.0a2
 
 [bobo]
 recipe = zc.recipe.egg