[Checkins] SVN: zc.recipe.macro/trunk/src/zc/recipe/macro/ Cleaned up the BuildoutManuel class, and the regexps.

[Aaron Lehmann]

Log message for revision 97512:
  Cleaned up the BuildoutManuel class, and the regexps.
  
  

Changed:
  U   zc.recipe.macro/trunk/src/zc/recipe/macro/QUICKSTART.txt
  U   zc.recipe.macro/trunk/src/zc/recipe/macro/tests.py

-=-
Modified: zc.recipe.macro/trunk/src/zc/recipe/macro/QUICKSTART.txt
===================================================================
--- zc.recipe.macro/trunk/src/zc/recipe/macro/QUICKSTART.txt	2009-03-05 05:25:28 UTC (rev 97511)
+++ zc.recipe.macro/trunk/src/zc/recipe/macro/QUICKSTART.txt	2009-03-05 05:41:51 UTC (rev 97512)
@@ -246,5 +246,3 @@
     [tired-rocker]
     question = Why does tired-rocker rock all night?
     recipe = zc.recipe.macro:empty
-
-Done Now.

Modified: zc.recipe.macro/trunk/src/zc/recipe/macro/tests.py
===================================================================
--- zc.recipe.macro/trunk/src/zc/recipe/macro/tests.py	2009-03-05 05:25:28 UTC (rev 97511)
+++ zc.recipe.macro/trunk/src/zc/recipe/macro/tests.py	2009-03-05 05:41:51 UTC (rev 97512)
@@ -136,10 +136,21 @@
 
 
 START_RE = re.compile(r'^Buildout::$', re.MULTILINE)
-END_RE = re.compile(r'(.+?)\n(?=\n\S).+?Result::(.+?)\n(?=\n\S)',
+END_RE = re.compile(r'(.+?)\n(?=\n\S).+?Result::(.+?)\n(?=\Z|\n\S)',
     re.DOTALL)
 
-class BuildoutManuel(object):
+class BuildoutManuel(manuel.Manuel):
+
+    # This uses the Manuel decorator methos in the __init__ so that the object
+    # can be a subclass of Manuel and have access to the tests it runs.
+
+    def __init__(self, setUp, *args, **kwargs):
+        super(BuildoutManuel, self).__init__(*args, **kwargs)
+        self.exteriorSetUp = setUp
+        self.parser(timing='early')(self.parse)
+        self.evaluater(self.evaluate)
+        self.formatter(self.format)
+
     def parse(self, document):
         document.regions = document.find_regions(START_RE, END_RE)
         for region in document:
@@ -189,7 +200,7 @@
 
     def setUp(self, test):
         self.test = test
-        setUp(test)
+        self.exteriorSetUp(test)
 
 
 def setUp(test):
@@ -228,13 +239,9 @@
         optionflags=(zope.testing.doctest.NORMALIZE_WHITESPACE |
                      zope.testing.doctest.ELLIPSIS))
 
-    bm = BuildoutManuel()
-    manuel_test = manuel.Manuel()
-    manuel_test.parser(timing='early')(bm.parse)
-    manuel_test.evaluater(bm.evaluate)
-    manuel_test.formatter(bm.format)
+    bm = BuildoutManuel(setUp)
 
-    m.extend(manuel_test)
+    m.extend(bm)
     quickstart = manuel.testing.TestSuite(m, 'QUICKSTART.txt', setUp=bm.setUp)
     suite.addTest(quickstart)
     readme = manuel.testing.TestSuite(m, 'README.txt', setUp=bm.setUp)