More work on doc generation

40 files changed, 921 insertions, 755 deletions

diff --git a/doc/errorclassplugin.html b/doc/errorclassplugin.html
index dea7e2b..3669cf5 100644
--- a/doc/errorclassplugin.html
+++ b/doc/errorclassplugin.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/module_nose.case.html b/doc/module_nose.case.html
index fbea18a..28c0e60 100644
--- a/doc/module_nose.case.html
+++ b/doc/module_nose.case.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -18,428 +18,431 @@
 classes when writing tests; they are used internally by nose.loader.TestLoader
 to create test cases from test functions and methods in test classes.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">TestBase</span><div class="cls doc"><p>Common functionality for FunctionTestCase and MethodTestCase.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
+<a name="Test"></a><div class="cls section"><span class="cls name">Test</span> (unittest.TestCase)<div class="cls doc"><p>The universal test case wrapper.</p>
+<p>When a plugin sees a test, it will always see an instance of this
+class. To access the actual test case that will be run, access the
+test property of the nose.case.Test instance.</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
 minimised; usually the top level of the traceback frame is not
 needed.</p>
-</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, methodName='runTest')</span><div class="method doc"><p>Create an instance of the class that will use the named test
-method when executed. Raises a ValueError if the instance does
-not have a method with the specified name.</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kwarg)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, test, config=None, resultProxy=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
+fed back as input to loadTestByName and (assuming the same
+plugin configuration) result in the loading of this test.</p>
+</div></div><div class="method section"><span class="method name">afterTest</span><span class="method args">(self, result)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
-</div></div><div class="method section"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section"><span class="method name">beforeTest</span><span class="method args">(self, result)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">exc_info</span><span class="method args">(self)</span><div class="method doc"><p>Extract exception info into a useable form, including
+appending captured output and assert introspection information, if
+so configured.</p>
+</div></div><div class="method section inherited"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
+</div></div><div class="method section inherited"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
-</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
+</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result)</span><div class="method doc"><p>Modified run for the test wrapper.</p>
+<p>From here we don't call result.startTest or stopTest or
+addSuccess.  The wrapper calls addError/addFailure only if its
+own setup or teardown fails, or running the wrapped test fails
+(eg, if the wrapped &quot;test&quot; is not callable).</p>
+<p>Two additional methods are called, beforeTest and
+afterTest. These give plugins a chance to modify the wrapped
+test before it is called and do cleanup after it is
+called. They are called unconditionally.</p>
+</div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self, result)</span><div class="method doc"><p>Run the test. Plugins may alter the test by returning a
+value from prepareTestCase. The value must be callable and
+must accept one argument, the result instance.</p>
+</div></div><div class="method section inherited"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
+</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
+</div></div><h4>Attributes</h4><div class="attr section inherited"><span class="attr name">context</span><span class="attr value"><property object at 0x2b5fad781b90></span><div class="attr doc"><p>Get the context object of this test (if any).</p>
 </div></div></div></div>
-<div class="cls section"><span class="cls name">MethodTestCase</span><div class="cls doc"><p>Test case wrapper for test methods.</p>
-<p>Don't use this class directly; it is used internally in nose to
-create test cases for test methods.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
+<a name="Failure"></a><div class="cls section"><span class="cls name">Failure</span> (unittest.TestCase)<div class="cls doc"><h4>Methods</h4><div class="method section inherited"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
 minimised; usually the top level of the traceback frame is not
 needed.</p>
-</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, method, test=None, arg=(), descriptor=None)</span><div class="method doc"><p>Initialize the MethodTestCase.</p>
-<p>Required argument:</p>
-<ul class="simple">
-<li>method -- the method to call, may be bound or unbound. In either</li>
-</ul>
-<div class="system-message">
-<p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">&lt;string&gt;</tt>, line 6)</p>
-Bullet list ends without a blank line; unexpected unindent.</div>
-<p>case, a new instance of the method's class will be instantiated to
-make the call.</p>
-<p>Optional arguments:</p>
-<ul class="simple">
-<li>test -- the test function to call. If this is passed, it will be
-called instead of getting a new bound method of the same name as the
-desired method from the test instance. This is to support generator
-methods that yield inline functions.</li>
-<li>arg -- arguments to pass to the test function. This is to support
-generator methods that yield arguments.</li>
-<li>descriptor -- the function, other than the test, that should be used
-to construct the test name. This is to support generator methods.</li>
-</ul>
-</div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_descriptors</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Get the descriptors of the test method: the method and
-arguments that will be used to construct the test name. In
-most cases, this is the method itself and no arguments. For
-tests generated by generator methods, the original
-(generator) method and args passed to the generated method
-or function are returned.</p>
-</div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
-fed back as input to loadTestByName and (assuming the same
-plugin configuration) result in the loading of this test.</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, exc_class, exc_val, tb=None)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
-</div></div><div class="method section"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
+</div></div><div class="method section inherited"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">context</span><span class="attr value"><property object at 0x2b16c7a474b0></span><div class="attr doc">Get context (class) of this test</div></div></div></div>
-<div class="cls section"><span class="cls name">FunctionTestCase</span><div class="cls doc"><p>TestCase wrapper for test functions.</p>
-<p>Don't use this class directly; it is used internally in nose to
-create test cases for test functions.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
+</div></div><div class="method section inherited"><span class="method name">id</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
+</div></div><div class="method section inherited"><span class="method name">shortDescription</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Returns a one-line description of the test, or None if no
+description has been provided.</p>
+<p>The default implementation of this method returns the first line of
+the specified test method's docstring.</p>
+</div></div><div class="method section inherited"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
+</div></div></div></div>
+<a name="TestBase"></a><div class="cls section"><span class="cls name">TestBase</span> (unittest.TestCase)<div class="cls doc"><p>Common functionality for FunctionTestCase and MethodTestCase.</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
 minimised; usually the top level of the traceback frame is not
 needed.</p>
-</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, test, setUp=None, tearDown=None, arg=(), descriptor=None)</span><div class="method doc"><p>Initialize the MethodTestCase.</p>
-<p>Required argument:</p>
-<ul class="simple">
-<li>test -- the test function to call.</li>
-</ul>
-<p>Optional arguments:</p>
-<ul class="simple">
-<li>setUp -- function to run at setup.</li>
-<li>tearDown -- function to run at teardown.</li>
-<li>arg -- arguments to pass to the test function. This is to support
-generator functions that yield arguments.</li>
-<li>descriptor -- the function, other than the test, that should be used
-to construct the test name. This is to support generator functions.</li>
-</ul>
-</div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_descriptors</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Get the descriptors of the test function: the function and
-arguments that will be used to construct the test name. In
-most cases, this is the function itself and no arguments. For
-tests generated by generator functions, the original
-(generator) function and args passed to the generated function
-are returned.</p>
-</div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
-fed back as input to loadTestByName and (assuming the same
-plugin configuration) result in the loading of this test.</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__init__</span><span class="method args">(self, methodName='runTest')</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Create an instance of the class that will use the named test
+method when executed. Raises a ValueError if the instance does
+not have a method with the specified name.</p>
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
-</div></div><div class="method section"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
+</div></div><div class="method section inherited"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"><p>Run any setup function attached to the test function</p>
-</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"><p>Run any teardown function attached to the test function</p>
-</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">context</span><span class="attr value"><property object at 0x2b16c7a47460></span><div class="attr doc">Get context (module) of this test</div></div></div></div>
-<div class="cls section"><span class="cls name">Failure</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
+</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
+</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
+</div></div></div></div>
+<a name="MethodTestCase"></a><div class="cls section"><span class="cls name">MethodTestCase</span> (<a href="module_nose.case.html#TestBase">TestBase</a>)<div class="cls doc"><p>Test case wrapper for test methods.</p>
+<p>Don't use this class directly; it is used internally in nose to
+create test cases for test methods.</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
 minimised; usually the top level of the traceback frame is not
 needed.</p>
-</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, exc_class, exc_val, tb=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, method, test=None, arg=(), descriptor=None)</span><div class="method doc"><p>Initialize the MethodTestCase.</p>
+<p>Required argument:</p>
+<ul class="simple">
+<li>method -- the method to call, may be bound or unbound. In either</li>
+</ul>
+<div class="system-message">
+<p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">&lt;string&gt;</tt>, line 6)</p>
+Bullet list ends without a blank line; unexpected unindent.</div>
+<p>case, a new instance of the method's class will be instantiated to
+make the call.</p>
+<p>Optional arguments:</p>
+<ul class="simple">
+<li>test -- the test function to call. If this is passed, it will be
+called instead of getting a new bound method of the same name as the
+desired method from the test instance. This is to support generator
+methods that yield inline functions.</li>
+<li>arg -- arguments to pass to the test function. This is to support
+generator methods that yield arguments.</li>
+<li>descriptor -- the function, other than the test, that should be used
+to construct the test name. This is to support generator methods.</li>
+</ul>
+</div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_descriptors</span><span class="method args">(self)</span><div class="method doc"><p>Get the descriptors of the test method: the method and
+arguments that will be used to construct the test name. In
+most cases, this is the method itself and no arguments. For
+tests generated by generator methods, the original
+(generator) method and args passed to the generated method
+or function are returned.</p>
+</div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
+fed back as input to loadTestByName and (assuming the same
+plugin configuration) result in the loading of this test.</p>
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
-</div></div><div class="method section"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
+</div></div><div class="method section inherited"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
-</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Returns a one-line description of the test, or None if no
-description has been provided.</p>
-<p>The default implementation of this method returns the first line of
-the specified test method's docstring.</p>
-</div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
+</div></div><div class="method section inherited"><span class="method name">id</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">runTest</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">shortDescription</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">context</span><span class="attr value"><property object at 0x2b5fad781cd0></span><div class="attr doc"><p>Get context (class) of this test</p>
 </div></div></div></div>
-<div class="cls section"><span class="cls name">Test</span><div class="cls doc"><p>The universal test case wrapper.</p>
-<p>When a plugin sees a test, it will always see an instance of this
-class. To access the actual test case that will be run, access the
-test property of the nose.case.Test instance.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
+<a name="FunctionTestCase"></a><div class="cls section"><span class="cls name">FunctionTestCase</span> (<a href="module_nose.case.html#TestBase">TestBase</a>)<div class="cls doc"><p>TestCase wrapper for test functions.</p>
+<p>Don't use this class directly; it is used internally in nose to
+create test cases for test functions.</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">_TestCase__exc_info</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Return a version of sys.exc_info() with the traceback frame
 minimised; usually the top level of the traceback frame is not
 needed.</p>
-</div></div><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kwarg)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, test, config=None, resultProxy=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
+</div></div><div class="method section inherited"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, test, setUp=None, tearDown=None, arg=(), descriptor=None)</span><div class="method doc"><p>Initialize the MethodTestCase.</p>
+<p>Required argument:</p>
+<ul class="simple">
+<li>test -- the test function to call.</li>
+</ul>
+<p>Optional arguments:</p>
+<ul class="simple">
+<li>setUp -- function to run at setup.</li>
+<li>tearDown -- function to run at teardown.</li>
+<li>arg -- arguments to pass to the test function. This is to support
+generator functions that yield arguments.</li>
+<li>descriptor -- the function, other than the test, that should be used
+to construct the test name. This is to support generator functions.</li>
+</ul>
+</div></div><div class="method section"><span class="method name">_context</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_descriptors</span><span class="method args">(self)</span><div class="method doc"><p>Get the descriptors of the test function: the function and
+arguments that will be used to construct the test name. In
+most cases, this is the function itself and no arguments. For
+tests generated by generator functions, the original
+(generator) function and args passed to the generated function
+are returned.</p>
+</div></div><div class="method section"><span class="method name">address</span><span class="method args">(self)</span><div class="method doc"><p>Return a round-trip name for this test, a name that can be
 fed back as input to loadTestByName and (assuming the same
 plugin configuration) result in the loading of this test.</p>
-</div></div><div class="method section"><span class="method name">afterTest</span><span class="method args">(self, result)</span><div class="method doc"></div></div><div class="method section"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertFalse</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertNotAlmostEquals</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">assertNotEquals</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">assertRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">beforeTest</span><span class="method args">(self, result)</span><div class="method doc"></div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">exc_info</span><span class="method args">(self)</span><div class="method doc"><p>Extract exception info into a useable form, including
-appending captured output and assert introspection information, if
-so configured.</p>
-</div></div><div class="method section"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
-</div></div><div class="method section"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
+</div></div><div class="method section inherited"><span class="method name">assertTrue</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">assert_</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Run the test without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">defaultTestResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">fail</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail immediately, with the given message.</p>
+</div></div><div class="method section inherited"><span class="method name">failIf</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test if the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failIfAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failIfEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are equal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
-</div></div><div class="method section"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
+</div></div><div class="method section inherited"><span class="method name">failUnless</span><span class="method args">(self, expr, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail the test unless the expression is true.</p>
+</div></div><div class="method section inherited"><span class="method name">failUnlessAlmostEqual</span><span class="method args">(self, first, second, places=7, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by their
 difference rounded to the given number of decimal places
 (default 7) and comparing to zero.</p>
 <p>Note that decimal places (from zero) are usually not the same
 as significant digits (measured from the most signficant digit).</p>
-</div></div><div class="method section"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
+</div></div><div class="method section inherited"><span class="method name">failUnlessEqual</span><span class="method args">(self, first, second, msg=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail if the two objects are unequal as determined by the '=='
 operator.</p>
-</div></div><div class="method section"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
+</div></div><div class="method section inherited"><span class="method name">failUnlessRaises</span><span class="method args">(self, excClass, callableObj, *args, **kwargs)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"><p>Fail unless an exception of class excClass is thrown
 by callableObj when invoked with arguments args and keyword
 arguments kwargs. If a different type of exception is
 thrown, it will not be caught, and the test case will be
 deemed to have suffered an error, exactly as for an
 unexpected exception.</p>
-</div></div><div class="method section"><span class="method name">id</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result)</span><div class="method doc"><p>Modified run for the test wrapper.</p>
-<p>From here we don't call result.startTest or stopTest or
-addSuccess.  The wrapper calls addError/addFailure only if its
-own setup or teardown fails, or running the wrapped test fails
-(eg, if the wrapped &quot;test&quot; is not callable).</p>
-<p>Two additional methods are called, beforeTest and
-afterTest. These give plugins a chance to modify the wrapped
-test before it is called and do cleanup after it is
-called. They are called unconditionally.</p>
-</div></div><div class="method section"><span class="method name">runTest</span><span class="method args">(self, result)</span><div class="method doc"><p>Run the test. Plugins may alter the test by returning a
-value from prepareTestCase. The value must be callable and
-must accept one argument, the result instance.</p>
-</div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for setting up the test fixture before exercising it.</p>
-</div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Hook method for deconstructing the test fixture after testing it.</p>
-</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">context</span><span class="attr value"><property object at 0x2b16c7a47370></span><div class="attr doc">Get the context object of this test (if any).</div></div></div></div>
+</div></div><div class="method section inherited"><span class="method name">id</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">run</span><span class="method args">(self, result=None)</span><span class="method inherited">(FIXME: inherited from TestCase)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">runTest</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"><p>Run any setup function attached to the test function</p>
+</div></div><div class="method section inherited"><span class="method name">shortDescription</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestBase)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"><p>Run any teardown function attached to the test function</p>
+</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">context</span><span class="attr value"><property object at 0x2b5fad781c80></span><div class="attr doc"><p>Get context (module) of this test</p>
+</div></div></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.commands.html b/doc/module_nose.commands.html
index 0f60ee4..b12c280 100644
--- a/doc/module_nose.commands.html
+++ b/doc/module_nose.commands.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -55,47 +55,47 @@ dependencies or that build C extensions, using the setuptools command
 can be more convenient than building by hand and running the nosetests
 script.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">nosetests</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, dist, **kw)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_ensure_stringlike</span><span class="method args">(self, option, what, default=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_ensure_tested_string</span><span class="method args">(self, option, tester, what, error_fmt, default=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">announce</span><span class="method args">(self, msg, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>If the current verbosity level is of greater than or equal to
+<a name="nosetests"></a><div class="cls section"><span class="cls name">nosetests</span> (setuptools.Command)<div class="cls doc"><h4>Methods</h4><div class="method section inherited"><span class="method name">__init__</span><span class="method args">(self, dist, **kw)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_ensure_stringlike</span><span class="method args">(self, option, what, default=None)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_ensure_tested_string</span><span class="method args">(self, option, tester, what, error_fmt, default=None)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">announce</span><span class="method args">(self, msg, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>If the current verbosity level is of greater than or equal to
 'level' print 'msg' to stdout.</p>
-</div></div><div class="method section"><span class="method name">copy_file</span><span class="method args">(self, infile, outfile, preserve_mode=1, preserve_times=1, link=None, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Copy a file respecting verbose, dry-run and force flags.  (The
+</div></div><div class="method section inherited"><span class="method name">copy_file</span><span class="method args">(self, infile, outfile, preserve_mode=1, preserve_times=1, link=None, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Copy a file respecting verbose, dry-run and force flags.  (The
 former two default to whatever is in the Distribution object, and
 the latter defaults to false for commands that don't define it.)</p>
-</div></div><div class="method section"><span class="method name">copy_tree</span><span class="method args">(self, infile, outfile, preserve_mode=1, preserve_times=1, preserve_symlinks=0, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Copy an entire directory tree respecting verbose, dry-run,
+</div></div><div class="method section inherited"><span class="method name">copy_tree</span><span class="method args">(self, infile, outfile, preserve_mode=1, preserve_times=1, preserve_symlinks=0, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Copy an entire directory tree respecting verbose, dry-run,
 and force flags.</p>
-</div></div><div class="method section"><span class="method name">debug_print</span><span class="method args">(self, msg)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Print 'msg' to stdout if the global DEBUG (taken from the
+</div></div><div class="method section inherited"><span class="method name">debug_print</span><span class="method args">(self, msg)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Print 'msg' to stdout if the global DEBUG (taken from the
 DISTUTILS_DEBUG environment variable) flag is true.</p>
-</div></div><div class="method section"><span class="method name">dump_options</span><span class="method args">(self, header=None, indent='')</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">ensure_dirname</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">ensure_filename</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Ensure that 'option' is the name of an existing file.</p>
-</div></div><div class="method section"><span class="method name">ensure_finalized</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">ensure_string</span><span class="method args">(self, option, default=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Ensure that 'option' is a string; if not defined, set it to
+</div></div><div class="method section inherited"><span class="method name">dump_options</span><span class="method args">(self, header=None, indent='')</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">ensure_dirname</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">ensure_filename</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Ensure that 'option' is the name of an existing file.</p>
+</div></div><div class="method section inherited"><span class="method name">ensure_finalized</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">ensure_string</span><span class="method args">(self, option, default=None)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Ensure that 'option' is a string; if not defined, set it to
 'default'.</p>
-</div></div><div class="method section"><span class="method name">ensure_string_list</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Ensure that 'option' is a list of strings.  If 'option' is
+</div></div><div class="method section inherited"><span class="method name">ensure_string_list</span><span class="method args">(self, option)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Ensure that 'option' is a list of strings.  If 'option' is
 currently a string, we split it either on /,s*/ or /s+/, so
 &quot;foo bar baz&quot;, &quot;foo,bar,baz&quot;, and &quot;foo,   bar baz&quot; all become
 [&quot;foo&quot;, &quot;bar&quot;, &quot;baz&quot;].</p>
-</div></div><div class="method section"><span class="method name">execute</span><span class="method args">(self, func, args, msg=None, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">finalize_options</span><span class="method args">(self)</span><div class="method doc"><p>nothing to do here</p>
-</div></div><div class="method section"><span class="method name">get_command_name</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">get_finalized_command</span><span class="method args">(self, command, create=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Wrapper around Distribution's 'get_command_obj()' method: find
+</div></div><div class="method section inherited"><span class="method name">execute</span><span class="method args">(self, func, args, msg=None, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section"><span class="method name">finalize_options</span><span class="method args">(self)</span><div class="method doc"><p>nothing to do here</p>
+</div></div><div class="method section inherited"><span class="method name">get_command_name</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">get_finalized_command</span><span class="method args">(self, command, create=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Wrapper around Distribution's 'get_command_obj()' method: find
 (create if necessary and 'create' is true) the command object for
 'command', call its 'ensure_finalized()' method, and return the
 finalized command object.</p>
-</div></div><div class="method section"><span class="method name">get_sub_commands</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Determine the sub-commands that are relevant in the current
+</div></div><div class="method section inherited"><span class="method name">get_sub_commands</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Determine the sub-commands that are relevant in the current
 distribution (ie., that need to be run).  This is based on the
 'sub_commands' class attribute: each tuple in that list may include
 a method that we call to determine if the subcommand needs to be
 run for the current distribution.  Return a list of command names.</p>
 </div></div><div class="method section"><span class="method name">initialize_options</span><span class="method args">(self)</span><div class="method doc"><p>create the member variables, but change hyphens to underscores</p>
-</div></div><div class="method section"><span class="method name">make_archive</span><span class="method args">(self, base_name, format, root_dir=None, base_dir=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">make_file</span><span class="method args">(self, infiles, outfile, func, args, exec_msg=None, skip_msg=None, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Special case of 'execute()' for operations that process one or
+</div></div><div class="method section inherited"><span class="method name">make_archive</span><span class="method args">(self, base_name, format, root_dir=None, base_dir=None)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">make_file</span><span class="method args">(self, infiles, outfile, func, args, exec_msg=None, skip_msg=None, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Special case of 'execute()' for operations that process one or
 more input files and generate one output file.  Works just like
 'execute()', except the operation is skipped and a different
 message printed if 'outfile' already exists and is newer than all
 files listed in 'infiles'.  If the command defined 'self.force',
 and it is true, then the command is unconditionally run -- does no
 timestamp checks.</p>
-</div></div><div class="method section"><span class="method name">mkpath</span><span class="method args">(self, name, mode=511)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">move_file</span><span class="method args">(self, src, dst, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Move a file respectin dry-run flag.</p>
-</div></div><div class="method section"><span class="method name">reinitialize_command</span><span class="method args">(self, command, reinit_subcommands=0, **kw)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self)</span><div class="method doc"><p>ensure tests are capable of being run, then
+</div></div><div class="method section inherited"><span class="method name">mkpath</span><span class="method args">(self, name, mode=511)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">move_file</span><span class="method args">(self, src, dst, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Move a file respectin dry-run flag.</p>
+</div></div><div class="method section inherited"><span class="method name">reinitialize_command</span><span class="method args">(self, command, reinit_subcommands=0, **kw)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self)</span><div class="method doc"><p>ensure tests are capable of being run, then
 run nose.main with a reconstructed argument list</p>
-</div></div><div class="method section"><span class="method name">run_command</span><span class="method args">(self, command)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run some other command: uses the 'run_command()' method of
+</div></div><div class="method section inherited"><span class="method name">run_command</span><span class="method args">(self, command)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Run some other command: uses the 'run_command()' method of
 Distribution, which creates and finalizes the command object if
 necessary and then invokes its 'run()' method.</p>
-</div></div><div class="method section"><span class="method name">set_undefined_options</span><span class="method args">(self, src_cmd, *option_pairs)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Set the values of any &quot;undefined&quot; options from corresponding
+</div></div><div class="method section inherited"><span class="method name">set_undefined_options</span><span class="method args">(self, src_cmd, *option_pairs)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Set the values of any &quot;undefined&quot; options from corresponding
 option values in some other command object.  &quot;Undefined&quot; here means
 &quot;is None&quot;, which is the convention used to indicate that an option
 has not been changed between 'initialize_options()' and
@@ -107,8 +107,10 @@ for it if necessary); the remaining arguments are
 '(src_option,dst_option)' tuples which mean &quot;take the value of
 'src_option' in the 'src_cmd' command object, and copy it to
 'dst_option' in the current command object&quot;.</p>
-</div></div><div class="method section"><span class="method name">spawn</span><span class="method args">(self, cmd, search_path=1, level=1)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Spawn an external command respecting dry-run flag.</p>
-</div></div><div class="method section"><span class="method name">warn</span><span class="method args">(self, msg)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">_nosetests__config</span><span class="attr value">Config(addPaths=True, args=(), configSection='nosetests', debug=None, debugLog=None, env={'GNOME_DESKTOP_SESSION_ID': 'Default', 'LOGNAME': 'jhp', 'USER': 'jhp', 'PATH': '/home/jhp/bin:/home/jhp/work/lfo_core/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games', 'HOME': '/home/jhp', 'DISPLAY': ':0.0', 'SSH_AGENT_PID': '3387', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm', 'SHELL': '/bin/bash', 'XAUTHORITY': '/home/jhp/.Xauthority', 'LANGUAGE': 'en', 'SESSION_MANAGER': 'local/localhost:/tmp/.ICE-unix/3320', 'SHLVL': '1', 'WINDOWID': '51215587', 'GPG_AGENT_INFO': '/home/jhp/.gnome2/seahorse-0os3Gb/S.gpg-agent:3387:1', 'USERNAME': 'jhp', 'GDM_XSERVER_LOCATION': 'local', 'COLORTERM': 'gnome-terminal', 'PYTHONPATH': '/home/jhp/lib/python2.4/site-packages', 'SSH_AUTH_SOCK': '/tmp/ssh-MMsjYq3320/agent.3320.seahorse', 'GNOME_KEYRING_SOCKET': '/tmp/keyring-lfCALE/socket', 'GDMSESSION': 'default', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-uKsQeSMIdc,guid=75505f469c9a2c45b82ce257c08d1e00', '_': './scripts/mkdocs.py', 'DESKTOP_SESSION': 'default', 'OLDPWD': '/home/jhp', 'PWD': '/home/jhp/work/nose/svn/trunk', 'DESKTOP_STARTUP_ID': '', 'GTK_RC_FILES': '/etc/gtk/gtkrc:/home/jhp/.gtkrc-1.2-gnome2'}, exclude=None, files=['/home/jhp/.noserc'], getTestCaseNamesCompat=False, ignoreFiles=(<_sre.SRE_Pattern object at 0x2b16c8459f80>, <_sre.SRE_Pattern object at 0x2b16c8459f10>, <_sre.SRE_Pattern object at 0x2b16c8d2dea0>), include=None, includeExe=False, logStream=<open file '<stderr>', mode 'w' at 0x2b16c65af210>, loggingConfig=None, options=(), parser=<optparse.OptionParser instance at 0x2b16c83ae440>, plugins=<nose.plugins.manager.DefaultPluginManager object at 0x2b16c8c99950>, runOnInit=True, srcDirs=('lib', 'src'), stopOnError=False, stream=<open file '<stderr>', mode 'w' at 0x2b16c65af210>, testMatch=<_sre.SRE_Pattern object at 0x2b16c8d0f990>, testMatchPat='(?:^|[\\b_\\./-])[Tt]est', testNames=(), verbosity=1, where=(), workingDir=None)</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">_nosetests__parser</span><span class="attr value"><optparse.OptionParser instance at 0x2b16c83ae440></span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">command_consumes_arguments</span><span class="attr value">False</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">description</span><span class="attr value">Run unit tests using nosetests</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">sub_commands</span><span class="attr value">[]</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">user_options</span><span class="attr value">[('version', 'V', 'Output nose version and exit'), ('plugins', 'p', 'Output list of available plugins and exit. Combine with higher verbosity for greater detail'), ('verbosity=', None, 'Set verbosity; --verbosity=2 is the same as -v'), ('quiet=', 'q', ''), ('config=', 'c', 'Load configuration from config file(s). May be specified multiple times; in that case, all config files will be loaded and combined'), ('where=', 'w', 'Look for tests in this directory. May be specified multiple times. The first directory passed will be used as the working directory, in place of the current working directory, which is the default. Others will be added to the list of tests to execute. [NOSE_WHERE]'), ('match=', 'm', 'Use this regular expression to find tests [NOSE_TESTMATCH]'), ('tests=', None, 'Run these tests (comma-separated list). This argument is useful mainly from configuration files; on the command line, just pass the tests to run as additional arguments with no switch.'), ('debug=', 'l', 'Activate debug logging for one or more systems. Available debug loggers: nose, nose.importer, nose.inspector, nose.plugins, nose.result and nose.selector. Separate multiple names with a comma.'), ('debug-log=', None, 'Log debug messages to this file (default: sys.stderr)'), ('logging-config=', None, 'Load logging config from this file -- bypasses all other logging config settings.'), ('exclude=', 'e', "Don't run tests that match regular expression [NOSE_EXCLUDE]"), ('include=', 'i', 'Also run tests that match regular expression [NOSE_INCLUDE]'), ('stop', 'x', 'Stop running tests after the first error or failure'), ('no-path-adjustment=', 'P', "Don't make any changes to sys.path when loading tests [NOSE_NOPATH]"), ('exe', None, 'Look for tests in python modules that are executable. Normal behavior is to exclude executable modules, since they may not be import-safe [NOSE_INCLUDE_EXE]'), ('noexe=', None, 'DO NOT look for tests in python modules that are executable. (The default on the windows platform is to do so.)'), ('with-html-output', None, 'Enable plugin HtmlOutput: Output test results as ugly, unstyled html.\n     [NOSE_WITH_HTML-OUTPUT]'), ('with-watch', None, 'Enable plugin NoseWatch: watch failing tests, re-testing when modified\n     [NOSE_WITH_WATCH]'), ('with-stopwatch', None, 'Enable plugin Stopwatch: (no help available) [NOSE_WITH_STOPWATCH]'), ('faster-than=', None, 'Run only tests that are faster than FASTER_THAN seconds.'), ('stopwatch-file=', None, 'Store test timing results in this file.'), ('with-figleafsections', None, 'Enable plugin FigleafSections: (no help available) [NOSE_WITH_FIGLEAFSECTIONS]'), ('figleaf-file=', None, 'Store figleaf section coverage in this file'), ('decorator-file=', None, 'Apply attributes in this file to matching functions, classes, and methods'), ('with-tty', None, 'Enable plugin NoseTTY: run nosetests more interactively [NOSE_WITH_TTY]'), ('tty', None, 'Enable plugin NoseTTY: run nosetests more interactively [NOSE_TTY]'), ('tty-editor=', None, 'editor program [NOSE_TTY_EDITOR or EDITOR] (currently: `None`)'), ('tty-edit-cmd=', None, 'template to invoke edit command.  [NOSE_TTY_EDIT_CMD] (currently: `%(editor)s %(filename)s --line %(lineno)s`)'), ('attr=', 'a', 'Run only tests that have attributes specified by ATTR [NOSE_ATTR]'), ('eval-attr=', 'A', 'Run only tests for whose attributes the Python expression EXPR evaluates to True [NOSE_EVAL_ATTR]'), ('nocapture=', 's', "Don't capture stdout (any stdout output will be printed immediately) [NOSE_NOCAPTURE]"), ('with-coverage', None, "Enable plugin Coverage: \nIf you have Ned Batchelder's coverage module installed, you may\nactivate a coverage report. The coverage report will cover any\npython source module imported after the start of the test run, excluding\nmodules that match testMatch. If you want to include those modules too,\nuse the --cover-tests switch, or set the NOSE_COVER_TESTS environment\nvariable to a true value. To restrict the coverage report to modules from\na particular package or packages, use the --cover-packages switch or the\nNOSE_COVER_PACKAGES environment variable.\n [NOSE_WITH_COVERAGE]"), ('cover-package=', None, 'Restrict coverage output to selected packages [NOSE_COVER_PACKAGE]'), ('cover-erase', None, 'Erase previously collected coverage statistics before run'), ('cover-tests', None, 'Include test modules in coverage report [NOSE_COVER_TESTS]'), ('cover-inclusive', None, 'Include all python files under working directory in coverage report.  Useful for discovering holes in test coverage if not all files are imported by the test suite. [NOSE_COVER_INCLUSIVE]'), ('pdb', None, 'Drop into debugger on errors'), ('pdb-failures', None, 'Drop into debugger on failures'), ('no-deprecated', None, 'Disable special handling of DeprecatedTest exceptions.'), ('with-doctest', None, 'Enable plugin Doctest: \nActivate doctest plugin to find and run doctests in non-test modules.\n [NOSE_WITH_DOCTEST]'), ('doctest-tests', None, 'Also look for doctests in test modules [NOSE_DOCTEST_TESTS]'), ('doctest-extension=', None, 'Also look for doctests in files with this extension [NOSE_DOCTEST_EXTENSION]'), ('with-isolation', None, 'Enable plugin IsolationPlugin: \nActivate the isolation plugin to isolate changes to external\nmodules to a single test module or package. The isolation plugin\nresets the contents of sys.modules after each test module or\npackage runs to its state before the test. PLEASE NOTE that this\nplugin should not be used with the coverage plugin in any other case\nwhere module reloading may produce undesirable side-effects.\n [NOSE_WITH_ISOLATION]'), ('detailed-errors', 'd', 'Add detail to error output by attempting to evaluate failed asserts [NOSE_DETAILED_ERRORS]'), ('with-profile', None, 'Enable plugin Profile: \nUse this plugin to run tests using the hotshot profiler. \n [NOSE_WITH_PROFILE]'), ('profile-sort=', None, 'Set sort order for profiler output'), ('profile-stats-file=', None, 'Profiler stats file; default is a new temp file on each run'), ('profile-restrict=', None, 'Restrict profiler output. See help for pstats.Stats for details'), ('no-skip', None, 'Disable special handling of SkipTest exceptions.'), ('with-id', None, "Enable plugin TestId: \nActivate to add a test id (like #1) to each test name output. After\nyou've run once to generate test ids, you can re-run individual\ntests by activating the plugin and passing the ids (with or\nwithout the # prefix) instead of test names.\n [NOSE_WITH_ID]"), ('id-file=', None, 'Store test ids found in test runs in this file.')]</span><div class="attr doc"></div></div></div></div>
+</div></div><div class="method section inherited"><span class="method name">spawn</span><span class="method args">(self, cmd, search_path=1, level=1)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"><p>Spawn an external command respecting dry-run flag.</p>
+</div></div><div class="method section inherited"><span class="method name">warn</span><span class="method args">(self, msg)</span><span class="method inherited">(FIXME: inherited from Command)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section inherited"><span class="attr name">_nosetests__config</span><span class="attr value">Config(addPaths=True, args=(), configSection='nosetests', debug=None, debugLog=None, env={}, exclude=None, files=['/home/jhp/.noserc'], getTestCaseNamesCompat=False, ignoreFiles=(<_sre.SRE_Pattern object at 0x2b5fae18ea40>, <_sre.SRE_Pattern object at 0x2b5fae18e9d0>, <_sre.SRE_Pattern object at 0x2b5faea6bb30>), include=None, includeExe=False, logStream=<open file '<stderr>', mode 'w' at 0x2b5fac2b9210>, loggingConfig=None, options=(), parser=<optparse.OptionParser instance at 0x2b5fadc0ff80>, plugins=<nose.plugins.manager.DefaultPluginManager object at 0x2b5fae1985d0>, runOnInit=True, srcDirs=('lib', 'src'), stopOnError=False, stream=<open file '<stderr>', mode 'w' at 0x2b5fac2b9210>, testMatch=<_sre.SRE_Pattern object at 0x2b5faeaa5120>, testMatchPat='(?:^|[\\b_\\./-])[Tt]est', testNames=(), verbosity=1, where=(), workingDir=None)</span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">_nosetests__parser</span><span class="attr value"><optparse.OptionParser instance at 0x2b5fadc0ff80></span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">command_consumes_arguments</span><span class="attr value">False</span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">description</span><span class="attr value">Run unit tests using nosetests</span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">sub_commands</span><span class="attr value">[]</span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">user_options</span><span class="attr value">[('version', 'V', 'Output nose version and exit'), ('plugins', 'p', 'Output list of available plugins and exit. Combine with higher verbosity for greater detail'), ('verbosity=', None, 'Set verbosity; --verbosity=2 is the same as -v'), ('quiet=', 'q', ''), ('config=', 'c', 'Load configuration from config file(s). May be specified multiple times; in that case, all config files will be loaded and combined'), ('where=', 'w', 'Look for tests in this directory. May be specified multiple times. The first directory passed will be used as the working directory, in place of the current working directory, which is the default. Others will be added to the list of tests to execute. [NOSE_WHERE]'), ('match=', 'm', 'Use this regular expression to find tests [NOSE_TESTMATCH]'), ('tests=', None, 'Run these tests (comma-separated list). This argument is useful mainly from configuration files; on the command line, just pass the tests to run as additional arguments with no switch.'), ('debug=', 'l', 'Activate debug logging for one or more systems. Available debug loggers: nose, nose.importer, nose.inspector, nose.plugins, nose.result and nose.selector. Separate multiple names with a comma.'), ('debug-log=', None, 'Log debug messages to this file (default: sys.stderr)'), ('logging-config=', None, 'Load logging config from this file -- bypasses all other logging config settings.'), ('exclude=', 'e', "Don't run tests that match regular expression [NOSE_EXCLUDE]"), ('include=', 'i', 'Also run tests that match regular expression [NOSE_INCLUDE]'), ('stop', 'x', 'Stop running tests after the first error or failure'), ('no-path-adjustment=', 'P', "Don't make any changes to sys.path when loading tests [NOSE_NOPATH]"), ('exe', None, 'Look for tests in python modules that are executable. Normal behavior is to exclude executable modules, since they may not be import-safe [NOSE_INCLUDE_EXE]'), ('noexe=', None, 'DO NOT look for tests in python modules that are executable. (The default on the windows platform is to do so.)'), ('with-html-output', None, 'Enable plugin HtmlOutput: Output test results as ugly, unstyled html.\n     [NOSE_WITH_HTML-OUTPUT]'), ('with-watch', None, 'Enable plugin NoseWatch: watch failing tests, re-testing when modified\n     [NOSE_WITH_WATCH]'), ('with-stopwatch', None, 'Enable plugin Stopwatch: (no help available) [NOSE_WITH_STOPWATCH]'), ('faster-than=', None, 'Run only tests that are faster than FASTER_THAN seconds.'), ('stopwatch-file=', None, 'Store test timing results in this file.'), ('with-figleafsections', None, 'Enable plugin FigleafSections: (no help available) [NOSE_WITH_FIGLEAFSECTIONS]'), ('figleaf-file=', None, 'Store figleaf section coverage in this file'), ('decorator-file=', None, 'Apply attributes in this file to matching functions, classes, and methods'), ('with-tty', None, 'Enable plugin NoseTTY: run nosetests more interactively [NOSE_WITH_TTY]'), ('tty', None, 'Enable plugin NoseTTY: run nosetests more interactively [NOSE_TTY]'), ('tty-editor=', None, 'editor program [NOSE_TTY_EDITOR or EDITOR] (currently: `None`)'), ('tty-edit-cmd=', None, 'template to invoke edit command.  [NOSE_TTY_EDIT_CMD] (currently: `%(editor)s %(filename)s --line %(lineno)s`)'), ('attr=', 'a', 'Run only tests that have attributes specified by ATTR [NOSE_ATTR]'), ('eval-attr=', 'A', 'Run only tests for whose attributes the Python expression EXPR evaluates to True [NOSE_EVAL_ATTR]'), ('nocapture=', 's', "Don't capture stdout (any stdout output will be printed immediately) [NOSE_NOCAPTURE]"), ('with-coverage', None, "Enable plugin Coverage: \nIf you have Ned Batchelder's coverage module installed, you may\nactivate a coverage report. The coverage report will cover any\npython source module imported after the start of the test run, excluding\nmodules that match testMatch. If you want to include those modules too,\nuse the --cover-tests switch, or set the NOSE_COVER_TESTS environment\nvariable to a true value. To restrict the coverage report to modules from\na particular package or packages, use the --cover-packages switch or the\nNOSE_COVER_PACKAGES environment variable.\n [NOSE_WITH_COVERAGE]"), ('cover-package=', None, 'Restrict coverage output to selected packages [NOSE_COVER_PACKAGE]'), ('cover-erase', None, 'Erase previously collected coverage statistics before run'), ('cover-tests', None, 'Include test modules in coverage report [NOSE_COVER_TESTS]'), ('cover-inclusive', None, 'Include all python files under working directory in coverage report.  Useful for discovering holes in test coverage if not all files are imported by the test suite. [NOSE_COVER_INCLUSIVE]'), ('pdb', None, 'Drop into debugger on errors'), ('pdb-failures', None, 'Drop into debugger on failures'), ('no-deprecated', None, 'Disable special handling of DeprecatedTest exceptions.'), ('with-doctest', None, 'Enable plugin Doctest: \nActivate doctest plugin to find and run doctests in non-test modules.\n [NOSE_WITH_DOCTEST]'), ('doctest-tests', None, 'Also look for doctests in test modules [NOSE_DOCTEST_TESTS]'), ('doctest-extension=', None, 'Also look for doctests in files with this extension [NOSE_DOCTEST_EXTENSION]'), ('with-isolation', None, 'Enable plugin IsolationPlugin: \nActivate the isolation plugin to isolate changes to external\nmodules to a single test module or package. The isolation plugin\nresets the contents of sys.modules after each test module or\npackage runs to its state before the test. PLEASE NOTE that this\nplugin should not be used with the coverage plugin in any other case\nwhere module reloading may produce undesirable side-effects.\n [NOSE_WITH_ISOLATION]'), ('detailed-errors', 'd', 'Add detail to error output by attempting to evaluate failed asserts [NOSE_DETAILED_ERRORS]'), ('with-profile', None, 'Enable plugin Profile: \nUse this plugin to run tests using the hotshot profiler. \n [NOSE_WITH_PROFILE]'), ('profile-sort=', None, 'Set sort order for profiler output'), ('profile-stats-file=', None, 'Profiler stats file; default is a new temp file on each run'), ('profile-restrict=', None, 'Restrict profiler output. See help for pstats.Stats for details'), ('no-skip', None, 'Disable special handling of SkipTest exceptions.'), ('with-id', None, "Enable plugin TestId: \nActivate to add a test id (like #1) to each test name output. After\nyou've run once to generate test ids, you can re-run individual\ntests by activating the plugin and passing the ids (with or\nwithout the # prefix) instead of test names.\n [NOSE_WITH_ID]"), ('id-file=', None, 'Store test ids found in test runs in this file.')]</span><div class="attr doc"></div></div></div></div><h2>Functions</h2>
+<a name="get_user_options"></a><div class="func section"><span class="func name">get_user_options</span><span class="func args">(parser)</span><div class="func doc"><p>convert a optparse option list into a distutils option tuple list</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.config.html b/doc/module_nose.config.html
index 6f1ecdd..ed82701 100644
--- a/doc/module_nose.config.html
+++ b/doc/module_nose.config.html
@@ -8,18 +8,18 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
       <h1>nose: nose.config</h1>
       
       <h2>Classes</h2>
-<div class="cls section"><span class="cls name">NoPlugins</span><div class="cls doc"><p>Plugin 'manager' that includes no plugins and returns None
+<a name="NoPlugins"></a><div class="cls section"><span class="cls name">NoPlugins</span> (object)<div class="cls doc"><p>Plugin 'manager' that includes no plugins and returns None
 for all calls</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(...)</span><div class="method doc"><p>x.__init__(...) initializes x; see x.__class__.__doc__ for signature</p>
+<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__init__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from object)</span><div class="method doc"><p>x.__init__(...) initializes x; see x.__class__.__doc__ for signature</p>
 </div></div></div></div>
-<div class="cls section"><span class="cls name">Config</span><div class="cls doc"><p>nose configuration.</p>
+<a name="Config"></a><div class="cls section"><span class="cls name">Config</span> (object)<div class="cls doc"><p>nose configuration.</p>
 <p>Instances of Config are used throughout nose to configure
 behavior, including plugin lists. Here are the default values for
 all config keys:</p>
@@ -67,7 +67,14 @@ it already has a handler.</p>
 </div></div><div class="method section"><span class="method name">help</span><span class="method args">(self, doc=None)</span><div class="method doc"><p>Return the generated help message</p>
 </div></div><div class="method section"><span class="method name">loadConfig</span><span class="method args">(self, file, argv)</span><div class="method doc"><p>Load config from file (may be filename or file-like object) and
 push the config into argv.</p>
-</div></div><div class="method section"><span class="method name">pluginOpts</span><span class="method args">(self, parser)</span><div class="method doc"></div></div><div class="method section"><span class="method name">reset</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">todict</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">update</span><span class="method args">(self, d)</span><div class="method doc"></div></div></div></div>
+</div></div><div class="method section"><span class="method name">pluginOpts</span><span class="method args">(self, parser)</span><div class="method doc"></div></div><div class="method section"><span class="method name">reset</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">todict</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">update</span><span class="method args">(self, d)</span><div class="method doc"></div></div></div></div><h2>Functions</h2>
+<a name="user_config_files"></a><div class="func section"><span class="func name">user_config_files</span><span class="func args">()</span><div class="func doc"><p>Return path to any existing user config files</p>
+</div></div>
+<a name="flag"></a><div class="func section"><span class="func name">flag</span><span class="func args">(val)</span><div class="func doc"><p>Does the value look like an on/off flag?</p>
+</div></div>
+<a name="all_config_files"></a><div class="func section"><span class="func name">all_config_files</span><span class="func args">()</span><div class="func doc"><p>Return path to any existing user config files, plus any setup.cfg
+in the current working directory.</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.core.html b/doc/module_nose.core.html
index 2ba8324..08f7729 100644
--- a/doc/module_nose.core.html
+++ b/doc/module_nose.core.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -16,17 +16,7 @@
       
       <p>Implements nose test program and collector.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">TestCollector</span><div class="cls doc"><p>Main nose test collector.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">This class is deprecated and will be removed in a future release.</p>
-</div>
-<p>Uses a test loader to load tests from the directory given in conf
-(conf.path). Uses the default test loader from nose.loader by
-default. Any other loader may be used so long as it implements
-loadTestsFromDir().</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, conf, loader=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">loadtests</span><span class="method args">(self)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">main</span><div class="cls doc"><p>usage: %prog [options] [names]</p>
+<a name="TestProgram"></a><div class="cls section"><span class="cls name">TestProgram</span> (unittest.TestProgram)<div class="cls doc"><p>usage: %prog [options] [names]</p>
 <p>nose provides extended test discovery and running features for
 unittest.</p>
 <p>nose collects tests automatically from python source files,
@@ -99,7 +89,7 @@ found.</p>
 </div></div><div class="method section"><span class="method name">runTests</span><span class="method args">(self)</span><div class="method doc"><p>Run Tests. Returns true on success, false on failure, and sets
 self.success to the same value.</p>
 </div></div><div class="method section"><span class="method name">showPlugins</span><span class="method args">(self)</span><div class="method doc"><p>Print list of available plugins.</p>
-</div></div><div class="method section"><span class="method name">usageExit</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">USAGE</span><span class="attr value">Usage: %(progName)s [options] [test] [...]
+</div></div><div class="method section inherited"><span class="method name">usageExit</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited from TestProgram)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section inherited"><span class="attr name">USAGE</span><span class="attr value">Usage: %(progName)s [options] [test] [...]
 
 Options:
   -h, --help       Show this message
@@ -112,101 +102,16 @@ Examples:
   %(progName)s MyTestCase.testSomething      - run MyTestCase.testSomething
   %(progName)s MyTestCase                    - run all 'test*' test methods
                                                in MyTestCase
-</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">verbosity</span><span class="attr value">1</span><div class="attr doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">TextTestRunner</span><div class="cls doc"><p>Test runner that uses nose's TextTestResult to enable errorClasses,
+</span><div class="attr doc"></div></div><div class="attr section inherited"><span class="attr name">verbosity</span><span class="attr value">1</span><div class="attr doc"></div></div></div></div>
+<a name="main"></a><div class="cls section"><span class="cls name">main</span> (unittest.TestProgram)<div class="cls doc">(Alias for <a href="module_nose.core.html#TestProgram">TestProgram</a>)</div></div>
+<a name="run_exit"></a><div class="cls section"><span class="cls name">run_exit</span> (unittest.TestProgram)<div class="cls doc">(Alias for <a href="module_nose.core.html#TestProgram">TestProgram</a>)</div></div>
+<a name="TextTestRunner"></a><div class="cls section"><span class="cls name">TextTestRunner</span> (unittest.TextTestRunner)<div class="cls doc"><p>Test runner that uses nose's TextTestResult to enable errorClasses,
 as well as providing hooks for plugins to override or replace the test
 output stream, results, and the test case itself.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, stream=<open file '<stderr>', mode 'w' at 0x2b16c65af210>, descriptions=1, verbosity=1, config=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_makeResult</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, test)</span><div class="method doc"><p>Overrides to provide plugin hooks and defer all output to
+<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, stream=<open file '<stderr>', mode 'w' at 0x2b5fac2b9210>, descriptions=1, verbosity=1, config=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_makeResult</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, test)</span><div class="method doc"><p>Overrides to provide plugin hooks and defer all output to
 the test result class.</p>
 </div></div></div></div>
-<div class="cls section"><span class="cls name">TestProgram</span><div class="cls doc"><p>usage: %prog [options] [names]</p>
-<p>nose provides extended test discovery and running features for
-unittest.</p>
-<p>nose collects tests automatically from python source files,
-directories and packages found in its working directory (which
-defaults to the current working directory). Any python source file,
-directory or package that matches the testMatch regular expression
-(by default: (?:^|[b_.-])[Tt]est) will be collected as a test (or
-source for collection of tests). In addition, all other packages
-found in the working directory will be examined for python source files
-or directories that match testMatch. Package discovery descends all
-the way down the tree, so package.tests and package.sub.tests and
-package.sub.sub2.tests will all be collected.</p>
-<p>Within a test directory or package, any python source file matching
-testMatch will be examined for test cases. Within a test module,
-functions and classes whose names match testMatch and TestCase
-subclasses with any name will be loaded and executed as tests. Tests
-may use the assert keyword or raise AssertionErrors to indicate test
-failure. TestCase subclasses may do the same or use the various
-TestCase methods available.</p>
-<div class="section">
-<h1><a id="selecting-tests" name="selecting-tests">Selecting Tests</a></h1>
-<p>To specify which tests to run, pass test names on the command line:</p>
-<blockquote>
-%prog only_test_this.py</blockquote>
-<p>Test names specified may be file or module names, and may optionally
-indicate the test case to run by separating the module or file name
-from the test case name with a colon. Filenames may be relative or
-absolute. Examples:</p>
-<blockquote>
-%prog test.module
-%prog another.test:TestCase.test_method
-%prog a.test:TestCase
-%prog /path/to/test/file.py:test_function</blockquote>
-<p>You may also change the working directory where nose looks for tests,
-use the -w switch:</p>
-<blockquote>
-%prog -w /path/to/tests</blockquote>
-<p>Note however that support for multiple -w arguments is deprecated
-in this version and will be removed in a future release, since as
-of nose 0.10 you can get the same behavior by specifying the
-target directories <em>without</em> the -w switch:</p>
-<blockquote>
-%prog /path/to/tests /another/path/to/tests</blockquote>
-<p>Further customization of test selection and loading is possible
-through the use of plugins.</p>
-<p>Test result output is identical to that of unittest, except for
-the additional features (error classes, and plugin-supplied
-features such as output capture and assert introspection) detailed
-in the options below.</p>
-</div>
-<div class="section">
-<h1><a id="configuration" name="configuration">Configuration</a></h1>
-<p>In addition to passing command-line options, you may also put configuration
-options in a .noserc or nose.cfg file in your home directory. These are
-standard .ini-style config files. Put your nosetests configuration in a
-[nosetests] section, with the -- prefix removed:</p>
-<blockquote>
-[nosetests]
-verbosity=3
-with-doctest=1</blockquote>
-<p>All configuration files that are found will be loaded and their options
-combined.</p>
-</div>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, module=None, defaultTest='.', argv=None, testRunner=None, testLoader=None, env=None, config=None, suite=None, exit=True)</span><div class="method doc"></div></div><div class="method section"><span class="method name">createTests</span><span class="method args">(self)</span><div class="method doc"><p>Create the tests to run. Default behavior is to discover
-tests using TestCollector using nose.loader.TestLoader as the
-test loader.</p>
-</div></div><div class="method section"><span class="method name">makeConfig</span><span class="method args">(self, env)</span><div class="method doc"><p>Load a Config, pre-filled with user config files if any are
-found.</p>
-</div></div><div class="method section"><span class="method name">parseArgs</span><span class="method args">(self, argv)</span><div class="method doc"><p>Parse argv and env and configure running environment.</p>
-</div></div><div class="method section"><span class="method name">runTests</span><span class="method args">(self)</span><div class="method doc"><p>Run Tests. Returns true on success, false on failure, and sets
-self.success to the same value.</p>
-</div></div><div class="method section"><span class="method name">showPlugins</span><span class="method args">(self)</span><div class="method doc"><p>Print list of available plugins.</p>
-</div></div><div class="method section"><span class="method name">usageExit</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">USAGE</span><span class="attr value">Usage: %(progName)s [options] [test] [...]
-
-Options:
-  -h, --help       Show this message
-  -v, --verbose    Verbose output
-  -q, --quiet      Minimal output
-
-Examples:
-  %(progName)s                               - run default set of tests
-  %(progName)s MyTestSuite                   - run suite 'MyTestSuite'
-  %(progName)s MyTestCase.testSomething      - run MyTestCase.testSomething
-  %(progName)s MyTestCase                    - run all 'test*' test methods
-                                               in MyTestCase
-</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">verbosity</span><span class="attr value">1</span><div class="attr doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">defaultTestCollector</span><div class="cls doc"><p>Main nose test collector.</p>
+<a name="TestCollector"></a><div class="cls section"><span class="cls name">TestCollector</span> ()<div class="cls doc"><p>Main nose test collector.</p>
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p class="last">This class is deprecated and will be removed in a future release.</p>
@@ -216,93 +121,17 @@ Examples:
 default. Any other loader may be used so long as it implements
 loadTestsFromDir().</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, conf, loader=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">loadtests</span><span class="method args">(self)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">run_exit</span><div class="cls doc"><p>usage: %prog [options] [names]</p>
-<p>nose provides extended test discovery and running features for
-unittest.</p>
-<p>nose collects tests automatically from python source files,
-directories and packages found in its working directory (which
-defaults to the current working directory). Any python source file,
-directory or package that matches the testMatch regular expression
-(by default: (?:^|[b_.-])[Tt]est) will be collected as a test (or
-source for collection of tests). In addition, all other packages
-found in the working directory will be examined for python source files
-or directories that match testMatch. Package discovery descends all
-the way down the tree, so package.tests and package.sub.tests and
-package.sub.sub2.tests will all be collected.</p>
-<p>Within a test directory or package, any python source file matching
-testMatch will be examined for test cases. Within a test module,
-functions and classes whose names match testMatch and TestCase
-subclasses with any name will be loaded and executed as tests. Tests
-may use the assert keyword or raise AssertionErrors to indicate test
-failure. TestCase subclasses may do the same or use the various
-TestCase methods available.</p>
-<div class="section">
-<h1><a id="selecting-tests" name="selecting-tests">Selecting Tests</a></h1>
-<p>To specify which tests to run, pass test names on the command line:</p>
-<blockquote>
-%prog only_test_this.py</blockquote>
-<p>Test names specified may be file or module names, and may optionally
-indicate the test case to run by separating the module or file name
-from the test case name with a colon. Filenames may be relative or
-absolute. Examples:</p>
-<blockquote>
-%prog test.module
-%prog another.test:TestCase.test_method
-%prog a.test:TestCase
-%prog /path/to/test/file.py:test_function</blockquote>
-<p>You may also change the working directory where nose looks for tests,
-use the -w switch:</p>
-<blockquote>
-%prog -w /path/to/tests</blockquote>
-<p>Note however that support for multiple -w arguments is deprecated
-in this version and will be removed in a future release, since as
-of nose 0.10 you can get the same behavior by specifying the
-target directories <em>without</em> the -w switch:</p>
-<blockquote>
-%prog /path/to/tests /another/path/to/tests</blockquote>
-<p>Further customization of test selection and loading is possible
-through the use of plugins.</p>
-<p>Test result output is identical to that of unittest, except for
-the additional features (error classes, and plugin-supplied
-features such as output capture and assert introspection) detailed
-in the options below.</p>
-</div>
-<div class="section">
-<h1><a id="configuration" name="configuration">Configuration</a></h1>
-<p>In addition to passing command-line options, you may also put configuration
-options in a .noserc or nose.cfg file in your home directory. These are
-standard .ini-style config files. Put your nosetests configuration in a
-[nosetests] section, with the -- prefix removed:</p>
-<blockquote>
-[nosetests]
-verbosity=3
-with-doctest=1</blockquote>
-<p>All configuration files that are found will be loaded and their options
-combined.</p>
-</div>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, module=None, defaultTest='.', argv=None, testRunner=None, testLoader=None, env=None, config=None, suite=None, exit=True)</span><div class="method doc"></div></div><div class="method section"><span class="method name">createTests</span><span class="method args">(self)</span><div class="method doc"><p>Create the tests to run. Default behavior is to discover
-tests using TestCollector using nose.loader.TestLoader as the
-test loader.</p>
-</div></div><div class="method section"><span class="method name">makeConfig</span><span class="method args">(self, env)</span><div class="method doc"><p>Load a Config, pre-filled with user config files if any are
-found.</p>
-</div></div><div class="method section"><span class="method name">parseArgs</span><span class="method args">(self, argv)</span><div class="method doc"><p>Parse argv and env and configure running environment.</p>
-</div></div><div class="method section"><span class="method name">runTests</span><span class="method args">(self)</span><div class="method doc"><p>Run Tests. Returns true on success, false on failure, and sets
-self.success to the same value.</p>
-</div></div><div class="method section"><span class="method name">showPlugins</span><span class="method args">(self)</span><div class="method doc"><p>Print list of available plugins.</p>
-</div></div><div class="method section"><span class="method name">usageExit</span><span class="method args">(self, msg=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">USAGE</span><span class="attr value">Usage: %(progName)s [options] [test] [...]
-
-Options:
-  -h, --help       Show this message
-  -v, --verbose    Verbose output
-  -q, --quiet      Minimal output
-
-Examples:
-  %(progName)s                               - run default set of tests
-  %(progName)s MyTestSuite                   - run suite 'MyTestSuite'
-  %(progName)s MyTestCase.testSomething      - run MyTestCase.testSomething
-  %(progName)s MyTestCase                    - run all 'test*' test methods
-                                               in MyTestCase
-</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">verbosity</span><span class="attr value">1</span><div class="attr doc"></div></div></div></div>
+<a name="defaultTestCollector"></a><div class="cls section"><span class="cls name">defaultTestCollector</span> ()<div class="cls doc">(Alias for <a href="module_nose.core.html#TestCollector">TestCollector</a>)</div></div><h2>Functions</h2>
+<a name="collector"></a><div class="func section"><span class="func name">collector</span><span class="func args">()</span><div class="func doc"><p>TestSuite replacement entry point. Use anywhere you might use a
+unittest.TestSuite. The collector will, by default, load options from
+all config files and execute loader.loadTestsFromNames() on the
+configured testNames, or '.' if no testNames are configured.</p>
+</div></div>
+<a name="runmodule"></a><div class="func section"><span class="func name">runmodule</span><span class="func args">(name='__main__')</span><div class="func doc"><p>Collect and run tests in a single module only. Defaults to running
+tests in __main__.</p>
+</div></div>
+<a name="run"></a><div class="func section"><span class="func name">run</span><span class="func args">(*arg, **kw)</span><div class="func doc"><p>Collect and run test, returning success or failure.</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.exc.html b/doc/module_nose.exc.html
index 34eb749..ef93cc1 100644
--- a/doc/module_nose.exc.html
+++ b/doc/module_nose.exc.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/module_nose.importer.html b/doc/module_nose.importer.html
index 9161eae..3b29048 100644
--- a/doc/module_nose.importer.html
+++ b/doc/module_nose.importer.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -20,7 +20,7 @@ necessary because test modules in different directories frequently have the
 same names, which means that the first loaded would mask the rest when using
 the builtin importer.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">Importer</span><div class="cls doc"><p>An importer class that does only path-specific imports. That
+<a name="Importer"></a><div class="cls section"><span class="cls name">Importer</span> (object)<div class="cls doc"><p>An importer class that does only path-specific imports. That
 is, the given module is not searched for on sys.path, but only at
 the path or in the directory specified.</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">importFromDir</span><span class="method args">(self, dir, fqname)</span><div class="method doc"><p>Import a module <em>only</em> from path, ignoring sys.path and
@@ -28,7 +28,11 @@ reloading if the version in sys.modules is not the one we want.</p>
 </div></div><div class="method section"><span class="method name">importFromPath</span><span class="method args">(self, path, fqname)</span><div class="method doc"><p>Import a dotted-name package whose tail is at path. In other words,
 given foo.bar and path/to/foo/bar.py, import foo from path/to/foo then
 bar from path/to/foo/bar, returning bar.</p>
-</div></div><div class="method section"><span class="method name">sameModule</span><span class="method args">(self, mod, filename)</span><div class="method doc"></div></div></div></div>
+</div></div><div class="method section"><span class="method name">sameModule</span><span class="method args">(self, mod, filename)</span><div class="method doc"></div></div></div></div><h2>Functions</h2>
+<a name="add_path"></a><div class="func section"><span class="func name">add_path</span><span class="func args">(path, config=None)</span><div class="func doc"><p>Ensure that the path, or the root of the current package (if
+path is in a package) is in sys.path.</p>
+</div></div>
+<a name="remove_path"></a><div class="func section"><span class="func name">remove_path</span><span class="func args">(path)</span><div class="func doc"></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.inspector.html b/doc/module_nose.inspector.html
index eb9c731..b8a6093 100644
--- a/doc/module_nose.inspector.html
+++ b/doc/module_nose.inspector.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -17,9 +17,29 @@
       <p>Simple traceback introspection. Used to add additional information to
 AssertionErrors in tests, so that failure messages may be more informative.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">Expander</span><div class="cls doc"><p>Simple expression expander. Uses tokenize to find the names and
+<a name="Expander"></a><div class="cls section"><span class="cls name">Expander</span> ()<div class="cls doc"><p>Simple expression expander. Uses tokenize to find the names and
 expands any that can be looked up in the frame.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, ttype, tok, start, end, line)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, locals, globals)</span><div class="method doc"></div></div></div></div>
+<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, ttype, tok, start, end, line)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, locals, globals)</span><div class="method doc"></div></div></div></div><h2>Functions</h2>
+<a name="inspect_traceback"></a><div class="func section"><span class="func name">inspect_traceback</span><span class="func args">(tb)</span><div class="func doc"><p>Inspect a traceback and its frame, returning source for the expression
+where the exception was raised, with simple variable replacement performed
+and the line on which the exception was raised marked with '&gt;&gt;'</p>
+</div></div>
+<a name="find_inspectable_lines"></a><div class="func section"><span class="func name">find_inspectable_lines</span><span class="func args">(lines, pos)</span><div class="func doc"><p>Find lines in home that are inspectable.</p>
+<p>Walk back from the err line up to 3 lines, but don't walk back over
+changes in indent level.</p>
+<p>Walk forward up to 3 lines, counting separated lines as 1. Don't walk
+over changes in indent level (unless part of an extended line)</p>
+</div></div>
+<a name="tbsource"></a><div class="func section"><span class="func name">tbsource</span><span class="func args">(tb, context=6)</span><div class="func doc"><p>Get source from  a traceback object.</p>
+<p>A tuple of two things is returned: a list of lines of context from
+the source code, and the index of the current line within that list.
+The optional second argument specifies the number of lines of context
+to return, which are centered around the current line.</p>
+<p>NOTE:</p>
+<p>This is adapted from inspect.py in the python 2.4 standard library, since
+a bug in the 2.3 version of inspect prevents it from correctly locating
+source lines in a traceback frame.</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.loader.html b/doc/module_nose.loader.html
index 0dada13..ab0e024 100644
--- a/doc/module_nose.loader.html
+++ b/doc/module_nose.loader.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -18,7 +18,7 @@
 superclass, unittest.TestLoader, but extends it by more liberal
 interpretations of what may be a test and how a test may be named.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">TestLoader</span><div class="cls doc"><p>Test loader that extends unittest.TestLoader to:</p>
+<a name="TestLoader"></a><div class="cls section"><span class="cls name">TestLoader</span> (unittest.TestLoader)<div class="cls doc"><p>Test loader that extends unittest.TestLoader to:</p>
 <ul class="simple">
 <li>Load tests from test-like functions and classes that are not
 unittest.TestCase subclasses</li>
@@ -28,105 +28,21 @@ unittest.TestCase subclasses</li>
 </ul>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None, importer=None, workingDir=None, selector=None)</span><div class="method doc"><p>Initialize a test loader.</p>
 <p>Parameters (all optional):</p>
-<ul>
-<li><p class="first">config: provide a <cite>nose.config.Config</cite> or other config class
-instance; if not provided a <cite>nose.config.Config</cite> with
-default values is used.</p>
-</li>
-<li><p class="first">importer: provide an importer instance that implenents
-<cite>importFromPath</cite>. If not provided, a
-<cite>nose.importer.Importer</cite> is used.</p>
-</li>
-<li><p class="first">workingDir: the directory to which file and module names are
-relative. If not provided, assumed to be the current working
-directory.</p>
-</li>
-<li><p class="first">selector: a selector class. If not provided, a
-<a href="#id1" name="id2"><span class="problematic" id="id2">`</span></a>nose.selector.Selector1 is used.</p>
-<div class="system-message" id="id1">
-<p class="system-message-title">System Message: <a name="id1">WARNING/2</a> (<tt class="docutils">&lt;string&gt;</tt>, line 14); <em><a href="#id2">backlink</a></em></p>
-<p>Inline interpreted text or phrase reference start-string without end-string.</p>
-</div>
-</li>
-</ul>
-</div></div><div class="method section"><span class="method name">getTestCaseNames</span><span class="method args">(self, testCaseClass)</span><div class="method doc"><p>Override to select with selector, unless
-config.getTestCaseNames.Compat is True</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromDir</span><span class="method args">(self, path)</span><div class="method doc"><p>Load tests from the directory at path. This is a generator
--- each suite of tests from a module or other file is yielded
-and is expected to be executed before the next file is
-examined.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromFile</span><span class="method args">(self, filename)</span><div class="method doc"><p>Load tests from a non-module file. Default is to raise a
-ValueError; plugins may implement <cite>loadTestsFromFile</cite> to
-provide a list of tests loaded from the file.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromGenerator</span><span class="method args">(self, generator, module)</span><div class="method doc"><p>Lazy-load tests from a generator function. The generator function
-may yield either:</p>
 <ul class="simple">
-<li>a callable, or</li>
-<li>a function name resolvable within the same module</li>
-</ul>
-</div></div><div class="method section"><span class="method name">loadTestsFromGeneratorMethod</span><span class="method args">(self, generator, cls)</span><div class="method doc"><p>Lazy-load tests from a generator method.</p>
-<p>This is more complicated than loading from a generator function,
-since a generator method may yield:</p>
-<ul class="simple">
-<li>a function</li>
-<li>a bound or unbound method, or</li>
-<li>a method name</li>
-</ul>
-</div></div><div class="method section"><span class="method name">loadTestsFromModule</span><span class="method args">(self, module, discovered=False)</span><div class="method doc"><p>Load all tests from module and return a suite containing
-them. If the module has been discovered and is not test-like,
-the suite will be empty by default, though plugins may add
-their own tests.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromName</span><span class="method args">(self, name, module=None, discovered=False)</span><div class="method doc"><p>Load tests from the entity with the given name.</p>
-<p>The name may indicate a file, directory, module, or any object
-within a module. See <cite>nose.util.split_test_name</cite> for details on
-test name parsing.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromNames</span><span class="method args">(self, names, module=None)</span><div class="method doc"><p>Load tests from all names, returning a suite containing all
-tests.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromTestCase</span><span class="method args">(self, testCaseClass)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a suite of all tests cases contained in testCaseClass</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromTestClass</span><span class="method args">(self, cls)</span><div class="method doc"><p>Load tests from a test class that is <em>not</em> a unittest.TestCase
-subclass.</p>
-<p>In this case, we can't depend on the class's <cite>__init__</cite> taking method
-name arguments, so we have to compose a MethodTestCase for each
-method in the class that looks testlike.</p>
-</div></div><div class="method section"><span class="method name">makeTest</span><span class="method args">(self, obj, parent=None)</span><div class="method doc"><p>Given a test object and its parent, return a test case
-or test suite.</p>
-</div></div><div class="method section"><span class="method name">resolve</span><span class="method args">(self, name, module)</span><div class="method doc"><p>Resolve name within module</p>
-</div></div><div class="method section"><span class="method name">sortTestMethodsUsing</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>cmp(x, y) -&gt; integer</p>
-<p>Return negative if x&lt;y, zero if x==y, positive if x&gt;y.</p>
-</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">testMethodPrefix</span><span class="attr value">test</span><div class="attr doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">defaultTestLoader</span><div class="cls doc"><p>Test loader that extends unittest.TestLoader to:</p>
-<ul class="simple">
-<li>Load tests from test-like functions and classes that are not
-unittest.TestCase subclasses</li>
-<li>Find and load test modules in a directory</li>
-<li>Support tests that are generators</li>
-<li>Support easy extensions of or changes to that behavior through plugins</li>
-</ul>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None, importer=None, workingDir=None, selector=None)</span><div class="method doc"><p>Initialize a test loader.</p>
-<p>Parameters (all optional):</p>
-<ul>
-<li><p class="first">config: provide a <cite>nose.config.Config</cite> or other config class
+<li>config: provide a <a class="reference" href="nose.config.config.html">nose.config.Config</a> or other config class
 instance; if not provided a <cite>nose.config.Config</cite> with
-default values is used.</p>
-</li>
-<li><p class="first">importer: provide an importer instance that implenents
+default values is used.</li>
+<li>importer: provide an importer instance that implenents
 <cite>importFromPath</cite>. If not provided, a
-<cite>nose.importer.Importer</cite> is used.</p>
-</li>
-<li><p class="first">workingDir: the directory to which file and module names are
+<cite>nose.importer.Importer</cite> is used.</li>
+<li>workingDir: the directory to which file and module names are
 relative. If not provided, assumed to be the current working
-directory.</p>
-</li>
-<li><p class="first">selector: a selector class. If not provided, a
-<a href="#id1" name="id2"><span class="problematic" id="id2">`</span></a>nose.selector.Selector1 is used.</p>
-<div class="system-message" id="id1">
-<p class="system-message-title">System Message: <a name="id1">WARNING/2</a> (<tt class="docutils">&lt;string&gt;</tt>, line 14); <em><a href="#id2">backlink</a></em></p>
-<p>Inline interpreted text or phrase reference start-string without end-string.</p>
-</div>
-</li>
+directory.</li>
+<li>selector: a selector class. If not provided, a
+<cite>nose.selector.Selector</cite> is used.</li>
 </ul>
 </div></div><div class="method section"><span class="method name">getTestCaseNames</span><span class="method args">(self, testCaseClass)</span><div class="method doc"><p>Override to select with selector, unless
-config.getTestCaseNames.Compat is True</p>
+config.getTestCaseNamesCompat is True</p>
 </div></div><div class="method section"><span class="method name">loadTestsFromDir</span><span class="method args">(self, path)</span><div class="method doc"><p>Load tests from the directory at path. This is a generator
 -- each suite of tests from a module or other file is yielded
 and is expected to be executed before the next file is
@@ -158,7 +74,7 @@ within a module. See <cite>nose.util.split_test_name</cite> for details on
 test name parsing.</p>
 </div></div><div class="method section"><span class="method name">loadTestsFromNames</span><span class="method args">(self, names, module=None)</span><div class="method doc"><p>Load tests from all names, returning a suite containing all
 tests.</p>
-</div></div><div class="method section"><span class="method name">loadTestsFromTestCase</span><span class="method args">(self, testCaseClass)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Return a suite of all tests cases contained in testCaseClass</p>
+</div></div><div class="method section inherited"><span class="method name">loadTestsFromTestCase</span><span class="method args">(self, testCaseClass)</span><span class="method inherited">(FIXME: inherited from TestLoader)</span><div class="method doc"><p>Return a suite of all tests cases contained in testCaseClass</p>
 </div></div><div class="method section"><span class="method name">loadTestsFromTestClass</span><span class="method args">(self, cls)</span><div class="method doc"><p>Load tests from a test class that is <em>not</em> a unittest.TestCase
 subclass.</p>
 <p>In this case, we can't depend on the class's <cite>__init__</cite> taking method
@@ -167,9 +83,10 @@ method in the class that looks testlike.</p>
 </div></div><div class="method section"><span class="method name">makeTest</span><span class="method args">(self, obj, parent=None)</span><div class="method doc"><p>Given a test object and its parent, return a test case
 or test suite.</p>
 </div></div><div class="method section"><span class="method name">resolve</span><span class="method args">(self, name, module)</span><div class="method doc"><p>Resolve name within module</p>
-</div></div><div class="method section"><span class="method name">sortTestMethodsUsing</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>cmp(x, y) -&gt; integer</p>
+</div></div><div class="method section inherited"><span class="method name">sortTestMethodsUsing</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from TestLoader)</span><div class="method doc"><p>cmp(x, y) -&gt; integer</p>
 <p>Return negative if x&lt;y, zero if x==y, positive if x&gt;y.</p>
-</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">testMethodPrefix</span><span class="attr value">test</span><div class="attr doc"></div></div></div></div>
+</div></div><h4>Attributes</h4><div class="attr section inherited"><span class="attr name">testMethodPrefix</span><span class="attr value">test</span><div class="attr doc"></div></div></div></div>
+<a name="defaultTestLoader"></a><div class="cls section"><span class="cls name">defaultTestLoader</span> (unittest.TestLoader)<div class="cls doc">(Alias for <a href="module_nose.loader.html#TestLoader">TestLoader</a>)</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.proxy.html b/doc/module_nose.proxy.html
index 3425191..bf149a7 100644
--- a/doc/module_nose.proxy.html
+++ b/doc/module_nose.proxy.html
@@ -8,15 +8,14 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
       <h1>nose: nose.proxy</h1>
       
       <p>The result proxy wraps the result instance given to each test. It
-performs two functions: enabling extended error/failure reporting,
-including output capture, assert introspection, and varied error classes,
+performs two functions: enabling extended error/failure reporting
 and calling plugins.</p>
 <p>As each result event is fired, plugins are called with the same event;
 however, plugins are called with the nose.case.Test instance that
@@ -27,7 +26,7 @@ have a single stable interface for all test types, and also to
 manipulate the test object itself by setting the <cite>test</cite> attribute of
 the nose.case.Test that they receive.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">ResultProxyFactory</span><div class="cls doc"><p>Factory for result proxies. Generates a ResultProxy bound to each test
+<a name="ResultProxyFactory"></a><div class="cls section"><span class="cls name">ResultProxyFactory</span> (object)<div class="cls doc"><p>Factory for result proxies. Generates a ResultProxy bound to each test
 and the result passed to the test.</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, result, test)</span><div class="method doc"><p>Return a ResultProxy for the current test.</p>
 <p>On first call, plugins are given a chance to replace the
@@ -35,13 +34,13 @@ result used for the remaining tests. If a plugin returns a
 value from prepareTestResult, that object will be used as the
 result for all tests.</p>
 </div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">ResultProxy</span><div class="cls doc"><p>Proxy to TestResults (or other results handler).</p>
+<a name="ResultProxy"></a><div class="cls section"><span class="cls name">ResultProxy</span> (object)<div class="cls doc"><p>Proxy to TestResults (or other results handler).</p>
 <p>One ResultProxy is created for each nose.case.Test. The result proxy
-handles processing the output capture and assert introspection duties,
-as well as calling plugins with the nose.case.Test instance (instead of the
+calls plugins with the nose.case.Test instance (instead of the
 wrapped test case) as each result call is made. Finally, the real result
 method is called with the wrapped test.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, result, test, config=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addError</span><span class="method args">(self, test, err)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addFailure</span><span class="method args">(self, test, err)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addSuccess</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">afterTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">assertMyTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">beforeTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">get_shouldStop</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">set_shouldStop</span><span class="method args">(self, shouldStop)</span><div class="method doc"></div></div><div class="method section"><span class="method name">startTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">stop</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">stopTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">shouldStop</span><span class="attr value"><property object at 0x2b16c7a59460></span><div class="attr doc">Should the test run stop?</div></div></div></div>
+<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, result, test, config=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addError</span><span class="method args">(self, test, err)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addFailure</span><span class="method args">(self, test, err)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addSuccess</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">afterTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">assertMyTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">beforeTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">get_shouldStop</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">set_shouldStop</span><span class="method args">(self, shouldStop)</span><div class="method doc"></div></div><div class="method section"><span class="method name">startTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">stop</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">stopTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">shouldStop</span><span class="attr value"><property object at 0x2b5fad799c80></span><div class="attr doc"><p>Should the test run stop?</p>
+</div></div></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.result.html b/doc/module_nose.result.html
index 85b6a4b..ba2fc53 100644
--- a/doc/module_nose.result.html
+++ b/doc/module_nose.result.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -19,21 +19,22 @@ provide support for error classes (such as the builtin skip and
 deprecated classes), and hooks for plugins to take over or extend
 reporting.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">TextTestResult</span><div class="cls doc"><p>Text test result that extends unittest's default test result
+<a name="TextTestResult"></a><div class="cls section"><span class="cls name">TextTestResult</span> (unittest._TextTestResult)<div class="cls doc"><p>Text test result that extends unittest's default test result
 support for a configurable set of errorClasses (eg, Skip,
 Deprecated, TODO) that extend the errors/failures/success triad.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, stream, descriptions, verbosity, config=None, errorClasses=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_addError</span><span class="method args">(self, test, err)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_count_relevant_tb_levels</span><span class="method args">(self, tb)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_exc_info_to_string</span><span class="method args">(self, err, test=None)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_is_relevant_tb_level</span><span class="method args">(self, tb)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addError</span><span class="method args">(self, test, err)</span><div class="method doc"><p>Overrides normal addError to add support for
+<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, stream, descriptions, verbosity, config=None, errorClasses=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_addError</span><span class="method args">(self, test, err)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_count_relevant_tb_levels</span><span class="method args">(self, tb)</span><span class="method inherited">(FIXME: inherited from TestResult)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_exc_info_to_string</span><span class="method args">(self, err, test=None)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_is_relevant_tb_level</span><span class="method args">(self, tb)</span><span class="method inherited">(FIXME: inherited from TestResult)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addError</span><span class="method args">(self, test, err)</span><div class="method doc"><p>Overrides normal addError to add support for
 errorClasses. If the exception is a registered class, the
 error will be added to the list for that class, not errors.</p>
-</div></div><div class="method section"><span class="method name">addFailure</span><span class="method args">(self, test, err)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addSuccess</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">getDescription</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">printErrorList</span><span class="method args">(self, flavour, errors)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">printErrors</span><span class="method args">(self)</span><div class="method doc"><p>Overrides to print all errorClasses errors as well.</p>
+</div></div><div class="method section inherited"><span class="method name">addFailure</span><span class="method args">(self, test, err)</span><span class="method inherited">(FIXME: inherited from _TextTestResult)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">addSuccess</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited from _TextTestResult)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">getDescription</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited from _TextTestResult)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">printErrorList</span><span class="method args">(self, flavour, errors)</span><span class="method inherited">(FIXME: inherited from _TextTestResult)</span><div class="method doc"></div></div><div class="method section"><span class="method name">printErrors</span><span class="method args">(self)</span><div class="method doc"><p>Overrides to print all errorClasses errors as well.</p>
 </div></div><div class="method section"><span class="method name">printSummary</span><span class="method args">(self, start, stop)</span><div class="method doc"><p>Called by the test runner to print the final summary of test
 run results.</p>
-</div></div><div class="method section"><span class="method name">startTest</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">stop</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Indicates that the tests should be aborted</p>
-</div></div><div class="method section"><span class="method name">stopTest</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Called when the given test has been run</p>
+</div></div><div class="method section inherited"><span class="method name">startTest</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited from _TextTestResult)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">stop</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestResult)</span><div class="method doc"><p>Indicates that the tests should be aborted</p>
+</div></div><div class="method section inherited"><span class="method name">stopTest</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited from TestResult)</span><div class="method doc"><p>Called when the given test has been run</p>
 </div></div><div class="method section"><span class="method name">wasSuccessful</span><span class="method args">(self)</span><div class="method doc"><p>Overrides to check that there are no errors in errorClasses
 lists that are marked as errors that should cause a run to
 fail.</p>
-</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">separator1</span><span class="attr value">======================================================================</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">separator2</span><span class="attr value">----------------------------------------------------------------------</span><div class="attr doc"></div></div></div></div>
+</div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">separator1</span><span class="attr value">======================================================================</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">separator2</span><span class="attr value">----------------------------------------------------------------------</span><div class="attr doc"></div></div></div></div><h2>Functions</h2>
+<a name="ln"></a><div class="func section"><span class="func name">ln</span><span class="func args">(*arg, **kw)</span><div class="func doc"></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.selector.html b/doc/module_nose.selector.html
index 830f57d..e6626a8 100644
--- a/doc/module_nose.selector.html
+++ b/doc/module_nose.selector.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -18,7 +18,7 @@
 appropriate selector method for each object it encounters that it
 thinks may be a test.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">defaultSelector</span><div class="cls doc"><p>Core test selector. Examines test candidates and determines whether,
+<a name="Selector"></a><div class="cls section"><span class="cls name">Selector</span> (object)<div class="cls doc"><p>Core test selector. Examines test candidates and determines whether,
 given the specified configuration, the test candidate should be selected
 as a test.</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config)</span><div class="method doc"></div></div><div class="method section"><span class="method name">configure</span><span class="method args">(self, config)</span><div class="method doc"></div></div><div class="method section"><span class="method name">matches</span><span class="method args">(self, name)</span><div class="method doc"><p>Does the name match my requirements?</p>
@@ -40,7 +40,8 @@ wanted, regardless of plugin, testMatch, include or exclude settings.</p>
 <p>The tail of the module name must match test requirements. One exception:
 we always want __main__.</p>
 </div></div></div></div>
-<div class="cls section"><span class="cls name">TestAddress</span><div class="cls doc"><p>A test address represents a user's request to run a particular
+<a name="defaultSelector"></a><div class="cls section"><span class="cls name">defaultSelector</span> (object)<div class="cls doc">(Alias for <a href="module_nose.selector.html#Selector">Selector</a>)</div></div>
+<a name="TestAddress"></a><div class="cls section"><span class="cls name">TestAddress</span> (object)<div class="cls doc"><p>A test address represents a user's request to run a particular
 test. The user may specify a filename or module (or neither),
 and/or a callable (a class, function, or method). The naming
 format for test addresses is:</p>
@@ -54,28 +55,6 @@ doesn't end in .py.</p>
 <p>Callables may be a class name, function name, method name, or
 class.method specification.</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, name, workingDir=None)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">Selector</span><div class="cls doc"><p>Core test selector. Examines test candidates and determines whether,
-given the specified configuration, the test candidate should be selected
-as a test.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config)</span><div class="method doc"></div></div><div class="method section"><span class="method name">configure</span><span class="method args">(self, config)</span><div class="method doc"></div></div><div class="method section"><span class="method name">matches</span><span class="method args">(self, name)</span><div class="method doc"><p>Does the name match my requirements?</p>
-<p>To match, a name must match config.testMatch OR config.include
-and it must not match config.exclude</p>
-</div></div><div class="method section"><span class="method name">wantClass</span><span class="method args">(self, cls)</span><div class="method doc"><p>Is the class a wanted test class?</p>
-<p>A class must be a unittest.TestCase subclass, or match test name
-requirements. Classes that start with _ are always excluded.</p>
-</div></div><div class="method section"><span class="method name">wantDirectory</span><span class="method args">(self, dirname)</span><div class="method doc"><p>Is the directory a wanted test directory?</p>
-<p>All package directories match, so long as they do not match exclude.
-All other directories must match test requirements.</p>
-</div></div><div class="method section"><span class="method name">wantFile</span><span class="method args">(self, file)</span><div class="method doc"><p>Is the file a wanted test file?</p>
-<p>The file must be a python source file and match testMatch or
-include, and not match exclude. Files that match ignore are <em>never</em>
-wanted, regardless of plugin, testMatch, include or exclude settings.</p>
-</div></div><div class="method section"><span class="method name">wantFunction</span><span class="method args">(self, function)</span><div class="method doc"><p>Is the function a test function?</p>
-</div></div><div class="method section"><span class="method name">wantMethod</span><span class="method args">(self, method)</span><div class="method doc"><p>Is the method a test method?</p>
-</div></div><div class="method section"><span class="method name">wantModule</span><span class="method args">(self, module)</span><div class="method doc"><p>Is the module a test module?</p>
-<p>The tail of the module name must match test requirements. One exception:
-we always want __main__.</p>
-</div></div></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.suite.html b/doc/module_nose.suite.html
index d99c111..4759a45 100644
--- a/doc/module_nose.suite.html
+++ b/doc/module_nose.suite.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -19,20 +19,21 @@ function, and ContextSuite, a suite that can run fixtures
 (setup/teardown functions or methods) for the context that contains
 its tests.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">MixedContextError</span><div class="cls doc"><p>Error raised when a context suite sees tests from more than
+<a name="MixedContextError"></a><div class="cls section"><span class="cls name">MixedContextError</span> (exceptions.Exception)<div class="cls doc"><p>Error raised when a context suite sees tests from more than
 one context.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__getitem__</span><span class="method args">(...)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(...)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">ContextSuite</span><div class="cls doc"><p>A suite with context.</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">__getitem__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from Exception)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__init__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from Exception)</span><div class="method doc"></div></div></div></div>
+<a name="ContextSuite"></a><div class="cls section"><span class="cls name">ContextSuite</span> (<a href="module_nose.suite.html#LazySuite">LazySuite</a>)<div class="cls doc"><p>A suite with context.</p>
 <p>A ContextSuite executes fixtures (setup and teardown functions or
 methods) for the context containing its tests.</p>
 <p>The context may be explicitly passed. If it is not, a context (or
 nested set of contexts) will be constructed by examining the tests
 in the suite.</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, tests=(), context=None, factory=None, config=None, resultProxy=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__iter__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__nonzero__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_get_tests</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_get_wrapped_tests</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_set_tests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addTests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the tests without collecting errors in a TestResult</p>
+<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, tests=(), context=None, factory=None, config=None, resultProxy=None)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__iter__</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from LazySuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__nonzero__</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from LazySuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_get_tests</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from LazySuite)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_get_wrapped_tests</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">_set_tests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited from LazySuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">addTest</span><span class="method args">(self, test)</span><span class="method inherited">(FIXME: inherited from LazySuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">addTests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"><p>Run the tests without collecting errors in a TestResult</p>
 </div></div><div class="method section"><span class="method name">exc_info</span><span class="method args">(self)</span><div class="method doc"><p>Hook for replacing error tuple output</p>
 </div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result)</span><div class="method doc"><p>Run tests in suite inside of suite fixtures.</p>
-</div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setupContext</span><span class="method args">(self, context)</span><div class="method doc"></div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">teardownContext</span><span class="method args">(self, context)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">_tests</span><span class="attr value"><property object at 0x2b16c7a594b0></span><div class="attr doc">Access the tests in this suite. Tests are returned inside of a context wrapper.</div></div><div class="attr section"><span class="attr name">was_setup</span><span class="attr value">False</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">was_torndown</span><span class="attr value">False</span><div class="attr doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">ContextSuiteFactory</span><div class="cls doc"><p>Factory for ContextSuites. Called with a collection of tests,
+</div></div><div class="method section"><span class="method name">setUp</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">setupContext</span><span class="method args">(self, context)</span><div class="method doc"></div></div><div class="method section"><span class="method name">shortDescription</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">tearDown</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">teardownContext</span><span class="method args">(self, context)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">_tests</span><span class="attr value"><property object at 0x2b5fad799cd0></span><div class="attr doc"><p>Access the tests in this suite. Tests are returned inside of a context wrapper.</p>
+</div></div><div class="attr section"><span class="attr name">was_setup</span><span class="attr value">False</span><div class="attr doc"></div></div><div class="attr section"><span class="attr name">was_torndown</span><span class="attr value">False</span><div class="attr doc"></div></div></div></div>
+<a name="ContextSuiteFactory"></a><div class="cls section"><span class="cls name">ContextSuiteFactory</span> (object)<div class="cls doc"><p>Factory for ContextSuites. Called with a collection of tests,
 the factory decides on a hierarchy of contexts by introspecting
 the collection or the tests them selves to find the objects
 containing the test objects. It always returns one suite, but that
@@ -44,7 +45,7 @@ iterable. In that case the tests will wrapped in
 nose.case.Test, be examined and the context of each found and a
 suite of suites returned, organized into a stack with the
 outermost suites belonging to the outermost contexts.</p>
-</div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None, suiteClass=None, resultProxy=<object object at 0x2b16c65f6050>)</span><div class="method doc"></div></div><div class="method section"><span class="method name">ancestry</span><span class="method args">(self, context)</span><div class="method doc"><p>Return the ancestry of the context (that is, all of the
+</div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, config=None, suiteClass=None, resultProxy=<object object at 0x2b5fac300050>)</span><div class="method doc"></div></div><div class="method section"><span class="method name">ancestry</span><span class="method args">(self, context)</span><div class="method doc"><p>Return the ancestry of the context (that is, all of the
 packages and modules containing the context), in order of
 descent with the outermost ancestor last.
 This method is a generator.</p>
@@ -62,16 +63,17 @@ input, returning a list of the common suite (which may be the
 suite or test we started with, if no common tests were found)
 plus the results of recursion.</p>
 </div></div><div class="method section"><span class="method name">wrapTests</span><span class="method args">(self, tests)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">TestModule</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(*arg, **kw)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">ContextList</span><div class="cls doc"><p>Not quite a suite -- a group of tests in a context. This is used
+<a name="TestModule"></a><div class="cls section"><span class="cls name">TestModule</span> ()<div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(*arg, **kw)</span><div class="method doc"></div></div></div></div>
+<a name="ContextList"></a><div class="cls section"><span class="cls name">ContextList</span> (object)<div class="cls doc"><p>Not quite a suite -- a group of tests in a context. This is used
 to hint the ContextSuiteFactory about what context the tests
 belong to, in cases where it may be ambiguous or missing.</p>
 <h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(self, tests, context=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__iter__</span><span class="method args">(self)</span><div class="method doc"></div></div></div></div>
-<div class="cls section"><span class="cls name">LazySuite</span><div class="cls doc"><p>A suite that may use a generator as its list of tests</p>
-<h4>Methods</h4><div class="method section"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, tests=())</span><div class="method doc"><p>Initialize the suite. tests may be an iterable or a generator</p>
-</div></div><div class="method section"><span class="method name">__iter__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__nonzero__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_get_tests</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_set_tests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addTests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><div class="method section"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>Run the tests without collecting errors in a TestResult</p>
-</div></div><div class="method section"><span class="method name">run</span><span class="method args">(self, result)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section"><span class="attr name">_tests</span><span class="attr value"><property object at 0x2b16c7a590f0></span><div class="attr doc">Access the tests in this suite. Access is through a generator, so iteration may not be repeatable.</div></div></div></div>
-<div class="cls section"><span class="cls name">TestDir</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(*arg, **kw)</span><div class="method doc"></div></div></div></div>
+<a name="LazySuite"></a><div class="cls section"><span class="cls name">LazySuite</span> (unittest.TestSuite)<div class="cls doc"><p>A suite that may use a generator as its list of tests</p>
+<h4>Methods</h4><div class="method section inherited"><span class="method name">__call__</span><span class="method args">(self, *args, **kwds)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, tests=())</span><div class="method doc"><p>Initialize the suite. tests may be an iterable or a generator</p>
+</div></div><div class="method section"><span class="method name">__iter__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__nonzero__</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_get_tests</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">_set_tests</span><span class="method args">(self, tests)</span><div class="method doc"></div></div><div class="method section"><span class="method name">addTest</span><span class="method args">(self, test)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">addTests</span><span class="method args">(self, tests)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">countTestCases</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">debug</span><span class="method args">(self)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"><p>Run the tests without collecting errors in a TestResult</p>
+</div></div><div class="method section inherited"><span class="method name">run</span><span class="method args">(self, result)</span><span class="method inherited">(FIXME: inherited from TestSuite)</span><div class="method doc"></div></div><h4>Attributes</h4><div class="attr section inherited"><span class="attr name">_tests</span><span class="attr value"><property object at 0x2b5fad799910></span><div class="attr doc"><p>Access the tests in this suite. Access is through a generator, so iteration may not be repeatable.</p>
+</div></div></div></div>
+<a name="TestDir"></a><div class="cls section"><span class="cls name">TestDir</span> ()<div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__init__</span><span class="method args">(*arg, **kw)</span><div class="method doc"></div></div></div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.tools.html b/doc/module_nose.tools.html
index b9934a5..35e0065 100644
--- a/doc/module_nose.tools.html
+++ b/doc/module_nose.tools.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -18,7 +18,97 @@
 easier. You don't have to use them; nothing in the rest of nose depends
 on any of these methods.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">TimeExpired</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__getitem__</span><span class="method args">(...)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(...)</span><div class="method doc"></div></div></div></div>
+<a name="TimeExpired"></a><div class="cls section"><span class="cls name">TimeExpired</span> (exceptions.AssertionError)<div class="cls doc"><h4>Methods</h4><div class="method section inherited"><span class="method name">__getitem__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from Exception)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__init__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from Exception)</span><div class="method doc"></div></div></div></div><h2>Functions</h2>
+<a name="assert_true"></a><div class="func section"><span class="func name">assert_true</span><span class="func args">(expr, msg)</span><div class="func doc"><p>Fail the test unless the expression is true.</p>
+</div></div>
+<a name="assert_equal"></a><div class="func section"><span class="func name">assert_equal</span><span class="func args">(first, second, msg)</span><div class="func doc"><p>Fail if the two objects are unequal as determined by the '=='
+operator.</p>
+</div></div>
+<a name="eq_"></a><div class="func section"><span class="func name">eq_</span><span class="func args">(a, b, msg=None)</span><div class="func doc"><p>Shorthand for 'assert a == b, &quot;%r != %r&quot; % (a, b)</p>
+</div></div>
+<a name="set_trace"></a><div class="func section"><span class="func name">set_trace</span><span class="func args">()</span><div class="func doc"><p>Call pdb.set_trace in the calling frame, first restoring
+sys.stdout to the real output stream. Note that sys.stdout is NOT
+reset to whatever it was before the call once pdb is done!</p>
+</div></div>
+<a name="assert_almost_equals"></a><div class="func section"><span class="func name">assert_almost_equals</span><span class="func args">(first, second, places, msg=None)</span><div class="func doc"><p>Fail if the two objects are unequal as determined by their
+difference rounded to the given number of decimal places
+(default 7) and comparing to zero.</p>
+<p>Note that decimal places (from zero) are usually not the same
+as significant digits (measured from the most signficant digit).</p>
+</div></div>
+<a name="assert_equals"></a><div class="func section"><span class="func name">assert_equals</span><span class="func args">(first, second, msg)</span><div class="func doc"><p>Fail if the two objects are unequal as determined by the '=='
+operator.</p>
+</div></div>
+<a name="make_decorator"></a><div class="func section"><span class="func name">make_decorator</span><span class="func args">(func)</span><div class="func doc"><p>Wraps a test decorator so as to properly replicate metadata
+of the decorated function, including nose's additional stuff
+(namely, setup and teardown).</p>
+</div></div>
+<a name="with_setup"></a><div class="func section"><span class="func name">with_setup</span><span class="func args">(setup=None, teardown=None)</span><div class="func doc"><p>Decorator to add setup and/or teardown methods to a test function:</p>
+<pre class="literal-block">
+&#64;with_setup(setup, teardown)
+def test_something():
+    # ...
+</pre>
+<p>Note that <cite>with_setup</cite> is useful <em>only</em> for test functions, not for test
+methods or inside of TestCase subclasses.</p>
+</div></div>
+<a name="assert_almost_equal"></a><div class="func section"><span class="func name">assert_almost_equal</span><span class="func args">(first, second, places, msg=None)</span><div class="func doc"><p>Fail if the two objects are unequal as determined by their
+difference rounded to the given number of decimal places
+(default 7) and comparing to zero.</p>
+<p>Note that decimal places (from zero) are usually not the same
+as significant digits (measured from the most signficant digit).</p>
+</div></div>
+<a name="assert_not_equal"></a><div class="func section"><span class="func name">assert_not_equal</span><span class="func args">(first, second, msg)</span><div class="func doc"><p>Fail if the two objects are equal as determined by the '=='
+operator.</p>
+</div></div>
+<a name="raises"></a><div class="func section"><span class="func name">raises</span><span class="func args">(*exceptions)</span><div class="func doc"><p>Test must raise one of expected exceptions to pass.</p>
+<p>Example use:</p>
+<pre class="literal-block">
+&#64;raises(TypeError, ValueError)
+def test_raises_type_error():
+    raise TypeError(&quot;This test passes&quot;)
+
+&#64;raises(Exception):
+def test_that_fails_by_passing():
+    pass
+</pre>
+<p>If you want to test many assertions about exceptions in a single test,
+you may want to use <cite>assert_raises</cite> instead.</p>
+</div></div>
+<a name="assert_not_almost_equals"></a><div class="func section"><span class="func name">assert_not_almost_equals</span><span class="func args">(first, second, places, msg=None)</span><div class="func doc"><p>Fail if the two objects are equal as determined by their
+difference rounded to the given number of decimal places
+(default 7) and comparing to zero.</p>
+<p>Note that decimal places (from zero) are usually not the same
+as significant digits (measured from the most signficant digit).</p>
+</div></div>
+<a name="assert_not_equals"></a><div class="func section"><span class="func name">assert_not_equals</span><span class="func args">(first, second, msg)</span><div class="func doc"><p>Fail if the two objects are equal as determined by the '=='
+operator.</p>
+</div></div>
+<a name="assert_raises"></a><div class="func section"><span class="func name">assert_raises</span><span class="func args">(excClass, callableObj, *args, **kwargs)</span><div class="func doc"><p>Fail unless an exception of class excClass is thrown
+by callableObj when invoked with arguments args and keyword
+arguments kwargs. If a different type of exception is
+thrown, it will not be caught, and the test case will be
+deemed to have suffered an error, exactly as for an
+unexpected exception.</p>
+</div></div>
+<a name="ok_"></a><div class="func section"><span class="func name">ok_</span><span class="func args">(expr, msg=None)</span><div class="func doc"><p>Shorthand for assert. Saves 3 whole characters!</p>
+</div></div>
+<a name="timed"></a><div class="func section"><span class="func name">timed</span><span class="func args">(limit)</span><div class="func doc"><p>Test must finish within specified time limit to pass.</p>
+<p>Example use:</p>
+<pre class="literal-block">
+&#64;timed(.1)
+def test_that_fails():
+    time.sleep(.2)
+</pre>
+</div></div>
+<a name="assert_false"></a><div class="func section"><span class="func name">assert_false</span><span class="func args">(expr, msg)</span><div class="func doc"><p>Fail the test if the expression is true.</p>
+</div></div>
+<a name="assert_not_almost_equal"></a><div class="func section"><span class="func name">assert_not_almost_equal</span><span class="func args">(first, second, places, msg=None)</span><div class="func doc"><p>Fail if the two objects are equal as determined by their
+difference rounded to the given number of decimal places
+(default 7) and comparing to zero.</p>
+<p>Note that decimal places (from zero) are usually not the same
+as significant digits (measured from the most signficant digit).</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.twistedtools.html b/doc/module_nose.twistedtools.html
index 607873d..1c1df7d 100644
--- a/doc/module_nose.twistedtools.html
+++ b/doc/module_nose.twistedtools.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -35,8 +35,49 @@ def test_resolve():
     d.addCallback(check_ip)
     return d
 </pre>
-<h2>Classes</h2>
-<div class="cls section"><span class="cls name">TimeExpired</span><div class="cls doc"><h4>Methods</h4><div class="method section"><span class="method name">__getitem__</span><span class="method args">(...)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(...)</span><div class="method doc"></div></div></div></div>
+<h2>Functions</h2>
+<a name="deferred"></a><div class="func section"><span class="func name">deferred</span><span class="func args">(timeout=None)</span><div class="func doc"><p>By wrapping a test function with this decorator, you can return a
+twisted Deferred and the test will wait for the deferred to be triggered.
+The whole test function will run inside the Twisted event loop.</p>
+<p>The optional timeout parameter specifies the maximum duration of the test.
+The difference with timed() is that timed() will still wait for the test
+to end, while deferred() will stop the test when its timeout has expired.
+The latter is more desireable when dealing with network tests, because
+the result may actually never arrive.</p>
+<p>If the callback is triggered, the test has passed.
+If the errback is triggered or the timeout expires, the test has failed.</p>
+<p>Example:</p>
+<pre class="literal-block">
+&#64;deferred(timeout=5.0)
+def test_resolve():
+    return reactor.resolve(&quot;nose.python-hosting.com&quot;)
+</pre>
+<p>Attention! If you combine this decorator with other decorators (like
+&quot;raises&quot;), deferred() must be called <em>first</em>!</p>
+<p>In other words, this is good:</p>
+<pre class="literal-block">
+&#64;raises(DNSLookupError)
+&#64;deferred()
+def test_error():
+    return reactor.resolve(&quot;xxxjhjhj.biz&quot;)
+</pre>
+<p>and this is bad:</p>
+<pre class="literal-block">
+&#64;deferred()
+&#64;raises(DNSLookupError)
+def test_error():
+    return reactor.resolve(&quot;xxxjhjhj.biz&quot;)
+</pre>
+</div></div>
+<a name="stop_reactor"></a><div class="func section"><span class="func name">stop_reactor</span><span class="func args">()</span><div class="func doc"><p>Stop the reactor and join the reactor thread until it stops.
+Call this function in teardown at the module or package level to
+reset the twisted system after your tests. You <em>must</em> do this if
+you mix tests using these tools and tests using twisted.trial.</p>
+</div></div>
+<a name="threaded_reactor"></a><div class="func section"><span class="func name">threaded_reactor</span><span class="func args">()</span><div class="func doc"><p>Start the Twisted reactor in a separate thread, if not already done.
+Returns the reactor.
+The thread will automatically be destroyed when all the tests are done.</p>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/module_nose.util.html b/doc/module_nose.util.html
index 9dd1268..7b69e73 100644
--- a/doc/module_nose.util.html
+++ b/doc/module_nose.util.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
@@ -16,31 +16,152 @@
       
       <p>Utility functions and classes used by nose internally.</p>
 <h2>Classes</h2>
-<div class="cls section"><span class="cls name">odict</span><div class="cls doc"><p>Simple ordered dict implementation, based on:</p>
+<a name="odict"></a><div class="cls section"><span class="cls name">odict</span> (dict)<div class="cls doc"><p>Simple ordered dict implementation, based on:</p>
 <p><a class="reference" href="http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747">http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747</a></p>
-<h4>Methods</h4><div class="method section"><span class="method name">__cmp__</span><span class="method args">(...)</span><div class="method doc"><p>x.__cmp__(y) &lt;==&gt; cmp(x,y)</p>
-</div></div><div class="method section"><span class="method name">__contains__</span><span class="method args">(...)</span><div class="method doc"><p>D.__contains__(k) -&gt; True if D has a key k, else False</p>
-</div></div><div class="method section"><span class="method name">__delitem__</span><span class="method args">(self, key)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__eq__</span><span class="method args">(...)</span><div class="method doc"><p>x.__eq__(y) &lt;==&gt; x==y</p>
-</div></div><div class="method section"><span class="method name">__ge__</span><span class="method args">(...)</span><div class="method doc"><p>x.__ge__(y) &lt;==&gt; x&gt;=y</p>
-</div></div><div class="method section"><span class="method name">__getitem__</span><span class="method args">(...)</span><div class="method doc"><p>x.__getitem__(y) &lt;==&gt; x[y]</p>
-</div></div><div class="method section"><span class="method name">__gt__</span><span class="method args">(...)</span><div class="method doc"><p>x.__gt__(y) &lt;==&gt; x&gt;y</p>
-</div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section"><span class="method name">__iter__</span><span class="method args">(...)</span><div class="method doc"><p>x.__iter__() &lt;==&gt; iter(x)</p>
-</div></div><div class="method section"><span class="method name">__le__</span><span class="method args">(...)</span><div class="method doc"><p>x.__le__(y) &lt;==&gt; x&lt;=y</p>
-</div></div><div class="method section"><span class="method name">__len__</span><span class="method args">(...)</span><div class="method doc"><p>x.__len__() &lt;==&gt; len(x)</p>
-</div></div><div class="method section"><span class="method name">__lt__</span><span class="method args">(...)</span><div class="method doc"><p>x.__lt__(y) &lt;==&gt; x&lt;y</p>
-</div></div><div class="method section"><span class="method name">__ne__</span><span class="method args">(...)</span><div class="method doc"><p>x.__ne__(y) &lt;==&gt; x!=y</p>
-</div></div><div class="method section"><span class="method name">__setitem__</span><span class="method args">(self, key, item)</span><div class="method doc"></div></div><div class="method section"><span class="method name">clear</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">copy</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">fromkeys</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>dict.fromkeys(S[,v]) -&gt; New dict with keys from S and values equal to v.
+<h4>Methods</h4><div class="method section inherited"><span class="method name">__cmp__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__cmp__(y) &lt;==&gt; cmp(x,y)</p>
+</div></div><div class="method section inherited"><span class="method name">__contains__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.__contains__(k) -&gt; True if D has a key k, else False</p>
+</div></div><div class="method section"><span class="method name">__delitem__</span><span class="method args">(self, key)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__eq__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__eq__(y) &lt;==&gt; x==y</p>
+</div></div><div class="method section inherited"><span class="method name">__ge__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__ge__(y) &lt;==&gt; x&gt;=y</p>
+</div></div><div class="method section inherited"><span class="method name">__getitem__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__getitem__(y) &lt;==&gt; x[y]</p>
+</div></div><div class="method section inherited"><span class="method name">__gt__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__gt__(y) &lt;==&gt; x&gt;y</p>
+</div></div><div class="method section"><span class="method name">__init__</span><span class="method args">(self, *arg, **kw)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">__iter__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__iter__() &lt;==&gt; iter(x)</p>
+</div></div><div class="method section inherited"><span class="method name">__le__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__le__(y) &lt;==&gt; x&lt;=y</p>
+</div></div><div class="method section inherited"><span class="method name">__len__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__len__() &lt;==&gt; len(x)</p>
+</div></div><div class="method section inherited"><span class="method name">__lt__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__lt__(y) &lt;==&gt; x&lt;y</p>
+</div></div><div class="method section inherited"><span class="method name">__ne__</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>x.__ne__(y) &lt;==&gt; x!=y</p>
+</div></div><div class="method section"><span class="method name">__setitem__</span><span class="method args">(self, key, item)</span><div class="method doc"></div></div><div class="method section"><span class="method name">clear</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">copy</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">fromkeys</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>dict.fromkeys(S[,v]) -&gt; New dict with keys from S and values equal to v.
 v defaults to None.</p>
-</div></div><div class="method section"><span class="method name">get</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.get(k[,d]) -&gt; D[k] if k in D, else d.  d defaults to None.</p>
-</div></div><div class="method section"><span class="method name">has_key</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.has_key(k) -&gt; True if D has a key k, else False</p>
-</div></div><div class="method section"><span class="method name">items</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">iteritems</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.iteritems() -&gt; an iterator over the (key, value) items of D</p>
-</div></div><div class="method section"><span class="method name">iterkeys</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.iterkeys() -&gt; an iterator over the keys of D</p>
-</div></div><div class="method section"><span class="method name">itervalues</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.itervalues() -&gt; an iterator over the values of D</p>
-</div></div><div class="method section"><span class="method name">keys</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section"><span class="method name">pop</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.pop(k[,d]) -&gt; v, remove specified key and return the corresponding value
+</div></div><div class="method section inherited"><span class="method name">get</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.get(k[,d]) -&gt; D[k] if k in D, else d.  d defaults to None.</p>
+</div></div><div class="method section inherited"><span class="method name">has_key</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.has_key(k) -&gt; True if D has a key k, else False</p>
+</div></div><div class="method section"><span class="method name">items</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">iteritems</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.iteritems() -&gt; an iterator over the (key, value) items of D</p>
+</div></div><div class="method section inherited"><span class="method name">iterkeys</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.iterkeys() -&gt; an iterator over the keys of D</p>
+</div></div><div class="method section inherited"><span class="method name">itervalues</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.itervalues() -&gt; an iterator over the values of D</p>
+</div></div><div class="method section"><span class="method name">keys</span><span class="method args">(self)</span><div class="method doc"></div></div><div class="method section inherited"><span class="method name">pop</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.pop(k[,d]) -&gt; v, remove specified key and return the corresponding value
 If key is not found, d is returned if given, otherwise KeyError is raised</p>
-</div></div><div class="method section"><span class="method name">popitem</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited)</span><div class="method doc"><p>D.popitem() -&gt; (k, v), remove and return some (key, value) pair as a
+</div></div><div class="method section inherited"><span class="method name">popitem</span><span class="method args">(...)</span><span class="method inherited">(FIXME: inherited from dict)</span><div class="method doc"><p>D.popitem() -&gt; (k, v), remove and return some (key, value) pair as a
 2-tuple; but raise KeyError if D is empty</p>
-</div></div><div class="method section"><span class="method name">setdefault</span><span class="method args">(self, key, failobj=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">update</span><span class="method args">(self, dict)</span><div class="method doc"></div></div><div class="method section"><span class="method name">values</span><span class="method args">(self)</span><div class="method doc"></div></div></div></div>
+</div></div><div class="method section"><span class="method name">setdefault</span><span class="method args">(self, key, failobj=None)</span><div class="method doc"></div></div><div class="method section"><span class="method name">update</span><span class="method args">(self, dict)</span><div class="method doc"></div></div><div class="method section"><span class="method name">values</span><span class="method args">(self)</span><div class="method doc"></div></div></div></div><h2>Functions</h2>
+<a name="absfile"></a><div class="func section"><span class="func name">absfile</span><span class="func args">(path, where=None)</span><div class="func doc"><p>Return absolute, normalized path to file (optionally in directory
+where), or None if the file can't be found either in where or the current
+working directory.</p>
+</div></div>
+<a name="tolist"></a><div class="func section"><span class="func name">tolist</span><span class="func args">(val)</span><div class="func doc"><p>Convert a value that may be a list or a (possibly comma-separated)
+string into a list. The exception: None is returned as None, not [None].</p>
+</div></div>
+<a name="try_run"></a><div class="func section"><span class="func name">try_run</span><span class="func args">(obj, names)</span><div class="func doc"><p>Given a list of possible method names, try to run them with the
+provided object. Keep going until something works. Used to run
+setup/teardown methods for module, package, and function tests.</p>
+</div></div>
+<a name="split_test_name"></a><div class="func section"><span class="func name">split_test_name</span><span class="func args">(test)</span><div class="func doc"><p>Split a test name into a 3-tuple containing file, module, and callable
+names, any of which (but not all) may be blank.</p>
+<p>Test names are in the form:</p>
+<p>file_or_module:callable</p>
+<p>Either side of the : may be dotted. To change the splitting behavior, you
+can alter nose.util.split_test_re.</p>
+</div></div>
+<a name="func_lineno"></a><div class="func section"><span class="func name">func_lineno</span><span class="func args">(func)</span><div class="func doc"><p>Get the line number of a function. First looks for
+compat_co_firstlineno, then func_code.co_first_lineno.</p>
+</div></div>
+<a name="match_last"></a><div class="func section"><span class="func name">match_last</span><span class="func args">(a, b, regex)</span><div class="func doc"><p>Sort compare function that puts items that match a
+regular expression last.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; from nose.config import Config
+&gt;&gt;&gt; c = Config()
+&gt;&gt;&gt; regex = c.testMatch
+&gt;&gt;&gt; entries = ['.', '..', 'a_test', 'src', 'lib', 'test', 'foo.py']
+&gt;&gt;&gt; entries.sort(lambda a, b: match_last(a, b, regex))
+&gt;&gt;&gt; entries
+['.', '..', 'foo.py', 'lib', 'src', 'a_test', 'test']
+</pre>
+</div></div>
+<a name="file_like"></a><div class="func section"><span class="func name">file_like</span><span class="func args">(name)</span><div class="func doc"><p>A name is file-like if it is a path that exists, or it has a
+directory part, or it ends in .py, or it isn't a legal python
+identifier.</p>
+</div></div>
+<a name="ln"></a><div class="func section"><span class="func name">ln</span><span class="func args">(label)</span><div class="func doc"><p>Draw a 70-char-wide divider, with label in the middle.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; ln('hello there')
+'---------------------------- hello there -----------------------------'
+</pre>
+</div></div>
+<a name="absdir"></a><div class="func section"><span class="func name">absdir</span><span class="func args">(path)</span><div class="func doc"><p>Return absolute, normalized path to directory, if it exists; None
+otherwise.</p>
+</div></div>
+<a name="isgenerator"></a><div class="func section"><span class="func name">isgenerator</span><span class="func args">(func)</span><div class="func doc"></div></div>
+<a name="anyp"></a><div class="func section"><span class="func name">anyp</span><span class="func args">(predicate, iterable)</span><div class="func doc"></div></div>
+<a name="test_address"></a><div class="func section"><span class="func name">test_address</span><span class="func args">(test)</span><div class="func doc"><p>Find the test address for a test, which may be a module, filename,
+class, method or function.</p>
+</div></div>
+<a name="getfilename"></a><div class="func section"><span class="func name">getfilename</span><span class="func args">(package, relativeTo=None)</span><div class="func doc"><p>Find the python source file for a package, relative to a
+particular directory (defaults to current working directory if not
+given).</p>
+</div></div>
+<a name="isclass"></a><div class="func section"><span class="func name">isclass</span><span class="func args">(obj)</span><div class="func doc"><p>Is obj a class? inspect's isclass is too liberal and returns True
+for objects that can't be subclasses of anything.</p>
+</div></div>
+<a name="resolve_name"></a><div class="func section"><span class="func name">resolve_name</span><span class="func args">(name, module=None)</span><div class="func doc"><p>Resolve a dotted name to a module and its parts. This is stolen
+wholesale from unittest.TestLoader.loadTestByName.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; resolve_name('nose.util') #doctest: +ELLIPSIS
+&lt;module 'nose.util' from...&gt;
+&gt;&gt;&gt; resolve_name('nose.util.resolve_name') #doctest: +ELLIPSIS
+&lt;function resolve_name at...&gt;
+</pre>
+</div></div>
+<a name="src"></a><div class="func section"><span class="func name">src</span><span class="func args">(filename)</span><div class="func doc"><p>Find the python source file for a .pyc or .pyo file. Returns the
+filename provided if it is not a python source file.</p>
+</div></div>
+<a name="ispackage"></a><div class="func section"><span class="func name">ispackage</span><span class="func args">(path)</span><div class="func doc"><p>Is this path a package directory?</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; ispackage('nose')
+True
+&gt;&gt;&gt; ispackage('unit_tests')
+False
+&gt;&gt;&gt; ispackage('nose/plugins')
+True
+&gt;&gt;&gt; ispackage('nose/loader.py')
+False
+</pre>
+</div></div>
+<a name="getpackage"></a><div class="func section"><span class="func name">getpackage</span><span class="func args">(filename)</span><div class="func doc"><p>Find the full dotted package name for a given python source file
+name. Returns None if the file is not a python source file.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; getpackage('foo.py')
+'foo'
+&gt;&gt;&gt; getpackage('biff/baf.py')
+'baf'
+&gt;&gt;&gt; getpackage('nose/util.py')
+'nose.util'
+</pre>
+<p>Works for directories too.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; getpackage('nose')
+'nose'
+&gt;&gt;&gt; getpackage('nose/plugins')
+'nose.plugins'
+</pre>
+<p>And __init__ files stuck onto directories</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; getpackage('nose/plugins/__init__.py')
+'nose.plugins'
+</pre>
+<p>Absolute paths also work.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; path = os.path.abspath(os.path.join('nose', 'plugins'))
+&gt;&gt;&gt; getpackage(path)
+'nose.plugins'
+</pre>
+</div></div>
+<a name="cmp_lineno"></a><div class="func section"><span class="func name">cmp_lineno</span><span class="func args">(a, b)</span><div class="func doc"><p>Compare functions by their line numbers.</p>
+<pre class="doctest-block">
+&gt;&gt;&gt; cmp_lineno(isgenerator, ispackage)
+-1
+&gt;&gt;&gt; cmp_lineno(ispackage, isgenerator)
+1
+&gt;&gt;&gt; cmp_lineno(isgenerator, isgenerator)
+0
+</pre>
+</div></div>
 
     </div>
   </body>
diff --git a/doc/plugin_attrib.html b/doc/plugin_attrib.html
index 7c83cbc..25c1ce7 100644
--- a/doc/plugin_attrib.html
+++ b/doc/plugin_attrib.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_capture.html b/doc/plugin_capture.html
index 684da5f..cb94b00 100644
--- a/doc/plugin_capture.html
+++ b/doc/plugin_capture.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_cover.html b/doc/plugin_cover.html
index 60a8c1c..76a05e4 100644
--- a/doc/plugin_cover.html
+++ b/doc/plugin_cover.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_debug.html b/doc/plugin_debug.html
index 7a03523..aa0994a 100644
--- a/doc/plugin_debug.html
+++ b/doc/plugin_debug.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_deprecated.html b/doc/plugin_deprecated.html
index b88d6c7..72b70ca 100644
--- a/doc/plugin_deprecated.html
+++ b/doc/plugin_deprecated.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_doctests.html b/doc/plugin_doctests.html
index fd2beb5..cf6b8bf 100644
--- a/doc/plugin_doctests.html
+++ b/doc/plugin_doctests.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_failuredetail.html b/doc/plugin_failuredetail.html
index d5e0827..f8bfd8f 100644
--- a/doc/plugin_failuredetail.html
+++ b/doc/plugin_failuredetail.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_interface.html b/doc/plugin_interface.html
index cb4ebaf..2bb1d1a 100644
--- a/doc/plugin_interface.html
+++ b/doc/plugin_interface.html
@@ -9,7 +9,7 @@
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
       <h2>New methods</h2><ul><li><a href="afterContext">afterContext</a></li><li><a href="afterDirectory">afterDirectory</a></li><li><a href="afterImport">afterImport</a></li><li><a href="afterTest">afterTest</a></li><li><a href="beforeContext">beforeContext</a></li><li><a href="beforeDirectory">beforeDirectory</a></li><li><a href="beforeImport">beforeImport</a></li><li><a href="beforeTest">beforeTest</a></li><li><a href="describeTest">describeTest</a></li><li><a href="formatError">formatError</a></li><li><a href="formatFailure">formatFailure</a></li><li><a href="handleError">handleError</a></li><li><a href="handleFailure">handleFailure</a></li><li><a href="loadTestsFromDir">loadTestsFromDir</a></li><li><a href="loadTestsFromFile">loadTestsFromFile</a></li><li><a href="loadTestsFromNames">loadTestsFromNames</a></li><li><a href="loadTestsFromTestClass">loadTestsFromTestClass</a></li><li><a href="makeTest">makeTest</a></li><li><a href="options">options</a></li><li><a href="prepareTestCase">prepareTestCase</a></li><li><a href="prepareTestLoader">prepareTestLoader</a></li><li><a href="prepareTestResult">prepareTestResult</a></li><li><a href="prepareTestRunner">prepareTestRunner</a></li><li><a href="startContext">startContext</a></li><li><a href="stopContext">stopContext</a></li><li><a href="testName">testName</a></li></ul><h2>Changed methods</h2><ul><li><a href="addError">addError</a></li><li><a href="addFailure">addFailure</a></li><li><a href="addSuccess">addSuccess</a></li></ul><h2>Deprecated methods</h2><ul><li><a href="addDeprecated">addDeprecated</a></li><li><a href="addOptions">addOptions</a></li><li><a href="addSkip">addSkip</a></li><li><a href="add_options">add_options</a></li><li><a href="loadTestsFromPath">loadTestsFromPath</a></li><li><a href="wantModuleTests">wantModuleTests</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_isolate.html b/doc/plugin_isolate.html
index c5e4d85..0a24ded 100644
--- a/doc/plugin_isolate.html
+++ b/doc/plugin_isolate.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_prof.html b/doc/plugin_prof.html
index 5635e97..9e8a244 100644
--- a/doc/plugin_prof.html
+++ b/doc/plugin_prof.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_skip.html b/doc/plugin_skip.html
index 6614e0d..a425a8a 100644
--- a/doc/plugin_skip.html
+++ b/doc/plugin_skip.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/plugin_testid.html b/doc/plugin_testid.html
index a679f69..758a874 100644
--- a/doc/plugin_testid.html
+++ b/doc/plugin_testid.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/doc/site.css b/doc/site.css
index b419f02..b91c6ab 100644
--- a/doc/site.css
+++ b/doc/site.css
@@ -192,16 +192,26 @@ pre.literal-block, pre.doctest-block {
              margin: 0px;
  }
 
-.cls.section { 
+.cls.section, .func.section { 
                margin-bottom: 2ex;
  }
 
-.cls.name { 
+.cls.name, .func.name { 
             font-size: 110%;
             font-weight: bold;
  }
 
-.cls.doc { 
+.cls.doc, .func.doc { 
            padding-left: 4em;
            padding-right: 2em;
  }
+
+.method.section 
+{ 
+  background: #ffe
+}
+
+.method.section.inherited
+{ 
+  background: none;
+}
diff --git a/doc/writing_plugins.html b/doc/writing_plugins.html
index fcbf65f..82ff219 100644
--- a/doc/writing_plugins.html
+++ b/doc/writing_plugins.html
@@ -8,7 +8,7 @@
     <div id="menu">
       <p>This document covers nose version <b>0.10.0a1</b></p>
       <h2>Documentation</h2><ul><li><a href="writing_plugins.html">Writing Plugins</a></li><li><a href="errorclassplugin.html">ErrorClass Plugins</a></li><li><a href="plugin_interface.html">Plugin Interface</a></li><li><a href="plugin_attrib.html">Builtin Plugin: attrib</a></li><li><a href="plugin_capture.html">Builtin Plugin: capture</a></li><li><a href="plugin_cover.html">Builtin Plugin: cover</a></li><li><a href="plugin_debug.html">Builtin Plugin: debug</a></li><li><a href="plugin_deprecated.html">Builtin Plugin: deprecated</a></li><li><a href="plugin_doctests.html">Builtin Plugin: doctests</a></li><li><a href="plugin_isolate.html">Builtin Plugin: isolate</a></li><li><a href="plugin_failuredetail.html">Builtin Plugin: failuredetail</a></li><li><a href="plugin_prof.html">Builtin Plugin: prof</a></li><li><a href="plugin_skip.html">Builtin Plugin: skip</a></li><li><a href="plugin_testid.html">Builtin Plugin: testid</a></li><li><a href="module_nose.loader.html">Module: nose.loader</a></li><li><a href="module_nose.result.html">Module: nose.result</a></li><li><a href="module_nose.inspector.html">Module: nose.inspector</a></li><li><a href="module_nose.tools.html">Module: nose.tools</a></li><li><a href="module_nose.importer.html">Module: nose.importer</a></li><li><a href="module_nose.suite.html">Module: nose.suite</a></li><li><a href="module_nose.config.html">Module: nose.config</a></li><li><a href="module_nose.core.html">Module: nose.core</a></li><li><a href="module_nose.twistedtools.html">Module: nose.twistedtools</a></li><li><a href="module_nose.util.html">Module: nose.util</a></li><li><a href="module_nose.proxy.html">Module: nose.proxy</a></li><li><a href="module_nose.selector.html">Module: nose.selector</a></li><li><a href="module_nose.case.html">Module: nose.case</a></li><li><a href="module_nose.commands.html">Module: nose.commands</a></li><li><a href="module_nose.exc.html">Module: nose.exc</a></li><li><a href="module_nose.plugins.manager.html">Module: nose.plugins.manager</a></li></ul>
-      <p>Last update: <b>Mon Jun 25 23:50:58 2007</b></p>
+      <p>Last update: <b>Tue Jun 26 15:41:38 2007</b></p>
     </div>
     
     <div id="main">
diff --git a/nose/case.py b/nose/case.py
index 6af1124..8e6130a 100644
--- a/nose/case.py
+++ b/nose/case.py
@@ -12,6 +12,9 @@ from nose.util import resolve_name, test_address, try_run
 log = logging.getLogger(__name__)
 
 
+__all__ = ['Test', 'Failure']
+
+
 # FIXME probably not the best name, since it is mainly used for errors
 class Failure(unittest.TestCase):
     __test__ = False # do not collect
diff --git a/nose/config.py b/nose/config.py
index 38ad074..3d7a9b3 100644
--- a/nose/config.py
+++ b/nose/config.py
@@ -98,7 +98,9 @@ class Config(object):
         #        self._working_dir = None
 
     def __repr__(self):
-        d = self.__dict__
+        d = self.__dict__.copy()
+        # don't expose env, could include sensitive info
+        d['env'] = {} 
         keys = [ k for k in d.keys()
                  if not k.startswith('_') ]
         keys.sort()
diff --git a/nose/core.py b/nose/core.py
index 95e97dd..0c392ec 100644
--- a/nose/core.py
+++ b/nose/core.py
@@ -20,60 +20,8 @@ from nose.util import isclass, tolist
 log = logging.getLogger('nose.core')
 compat_24 = sys.version_info >= (2, 4)
 
-class TestCollector:
-    """Main nose test collector.
-
-    .. Note:: This class is deprecated and will be removed in a future release.
-
-    Uses a test loader to load tests from the directory given in conf
-    (conf.path). Uses the default test loader from nose.loader by
-    default. Any other loader may be used so long as it implements
-    loadTestsFromDir().
-    """
-    def __init__(self, conf, loader=None):
-        warn("TestCollector is deprecated and will be removed in the"
-             "next release of nose. "
-             "Use `nose.loader.TestLoader.loadTestsFromNames` instead",
-             DeprecationWarning)
-    
-        if loader is None:
-            loader = defaultTestLoader(conf)
-        self.conf = conf
-        self.loader = loader
-        self.path = conf.where
-        
-    def loadtests(self):
-        path = tolist(self.path)
-        return self.loader.loadTestsFromNames(path)
-            
-    def __repr__(self):
-        return "collector in %s" % self.path
-    __str__ = __repr__
-    
-defaultTestCollector = TestCollector
-
-
-def collector():
-    """TestSuite replacement entry point. Use anywhere you might use a
-    unittest.TestSuite. The collector will, by default, load options from
-    all config files and execute loader.loadTestsFromNames() on the
-    configured testNames, or '.' if no testNames are configured.
-    """
-    # plugins that implement any of these methods are disabled, since
-    # we don't control the test runner and won't be able to run them
-    setuptools_incompat = ('report', 'finalize', 'prepareTest',
-                           'prepareTestLoader', 'prepareTestRunner',
-                           'setOutputStream')
-    
-    conf = Config(files=all_config_files(),
-                  plugins=RestrictedPluginManager(exclude=setuptools_incompat))
-    conf.configure(argv=['collector'])
-    loader = defaultTestLoader(conf)
-
-    if conf.testNames:
-        return loader.loadTestsFromNames(conf.testNames)
-    else:
-        return loader.loadTestsFromNames(('.',))
+__all__ = ['TestProgram', 'main', 'run', 'run_exit', 'runmodule', 'collector',
+           'TextTestRunner']
 
             
 class TextTestRunner(unittest.TextTestRunner):
@@ -341,5 +289,61 @@ def runmodule(name='__main__'):
     main(defaultTest=name)    
 
 
+def collector():
+    """TestSuite replacement entry point. Use anywhere you might use a
+    unittest.TestSuite. The collector will, by default, load options from
+    all config files and execute loader.loadTestsFromNames() on the
+    configured testNames, or '.' if no testNames are configured.
+    """
+    # plugins that implement any of these methods are disabled, since
+    # we don't control the test runner and won't be able to run them
+    setuptools_incompat = ('report', 'finalize', 'prepareTest',
+                           'prepareTestLoader', 'prepareTestRunner',
+                           'setOutputStream')
+    
+    conf = Config(files=all_config_files(),
+                  plugins=RestrictedPluginManager(exclude=setuptools_incompat))
+    conf.configure(argv=['collector'])
+    loader = defaultTestLoader(conf)
+
+    if conf.testNames:
+        return loader.loadTestsFromNames(conf.testNames)
+    else:
+        return loader.loadTestsFromNames(('.',))
+
+
+class TestCollector:
+    """Main nose test collector.
+
+    .. Note:: This class is deprecated and will be removed in a future release.
+
+    Uses a test loader to load tests from the directory given in conf
+    (conf.path). Uses the default test loader from nose.loader by
+    default. Any other loader may be used so long as it implements
+    loadTestsFromDir().
+    """
+    def __init__(self, conf, loader=None):
+        warn("TestCollector is deprecated and will be removed in the"
+             "next release of nose. "
+             "Use `nose.loader.TestLoader.loadTestsFromNames` instead",
+             DeprecationWarning)
+    
+        if loader is None:
+            loader = defaultTestLoader(conf)
+        self.conf = conf
+        self.loader = loader
+        self.path = conf.where
+        
+    def loadtests(self):
+        path = tolist(self.path)
+        return self.loader.loadTestsFromNames(path)
+            
+    def __repr__(self):
+        return "collector in %s" % self.path
+    __str__ = __repr__
+    
+defaultTestCollector = TestCollector
+
+
 if __name__ == '__main__':
     main()
diff --git a/nose/loader.py b/nose/loader.py
index 8b45af4..0e90a32 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -24,6 +24,8 @@ from suite import ContextSuiteFactory, ContextList, LazySuite
 log = logging.getLogger(__name__)
 #log.setLevel(logging.DEBUG)
 
+__all__ = ['TestLoader', 'defaultTestLoader']
+
 class TestLoader(unittest.TestLoader):
     """Test loader that extends unittest.TestLoader to:
 
@@ -39,7 +41,7 @@ class TestLoader(unittest.TestLoader):
 
         Parameters (all optional):
 
-        * config: provide a `nose.config.Config` or other config class
+        * config: provide a `nose.config.Config`_ or other config class
           instance; if not provided a `nose.config.Config` with
           default values is used.          
         * importer: provide an importer instance that implenents
@@ -49,7 +51,7 @@ class TestLoader(unittest.TestLoader):
           relative. If not provided, assumed to be the current working
           directory.
         * selector: a selector class. If not provided, a
-          `nose.selector.Selector1 is used.
+          `nose.selector.Selector` is used.
         """
         if config is None:
             config = Config()
@@ -70,7 +72,7 @@ class TestLoader(unittest.TestLoader):
 
     def getTestCaseNames(self, testCaseClass):
         """Override to select with selector, unless
-        config.getTestCaseNames.Compat is True
+        config.getTestCaseNamesCompat is True
         """
         if self.config.getTestCaseNamesCompat:
             return unittest.TestLoader.getTestCaseNames(self, testCaseClass)
diff --git a/nose/proxy.py b/nose/proxy.py
index e80054f..777b7ef 100644
--- a/nose/proxy.py
+++ b/nose/proxy.py
@@ -3,8 +3,7 @@ Result Proxy
 ------------
 
 The result proxy wraps the result instance given to each test. It
-performs two functions: enabling extended error/failure reporting,
-including output capture, assert introspection, and varied error classes,
+performs two functions: enabling extended error/failure reporting
 and calling plugins.
 
 As each result event is fired, plugins are called with the same event;
@@ -55,8 +54,7 @@ class ResultProxy(object):
     """Proxy to TestResults (or other results handler).
 
     One ResultProxy is created for each nose.case.Test. The result proxy
-    handles processing the output capture and assert introspection duties,
-    as well as calling plugins with the nose.case.Test instance (instead of the
+    calls plugins with the nose.case.Test instance (instead of the
     wrapped test case) as each result call is made. Finally, the real result
     method is called with the wrapped test.
     """    
diff --git a/nose/selector.py b/nose/selector.py
index de28a53..7aa6597 100644
--- a/nose/selector.py
+++ b/nose/selector.py
@@ -14,6 +14,9 @@ from nose.util import split_test_name, src, getfilename, getpackage
 
 log = logging.getLogger(__name__)
 
+__all__ = ['Selector', 'defaultSelector', 'TestAddress']
+
+
 class Selector(object):
     """Core test selector. Examines test candidates and determines whether,
     given the specified configuration, the test candidate should be selected
diff --git a/nose/tools.py b/nose/tools.py
index d13c0c7..ff5895d 100644
--- a/nose/tools.py
+++ b/nose/tools.py
@@ -57,7 +57,9 @@ def make_decorator(func):
 
 
 def raises(*exceptions):
-    """Test must raise one of expected exceptions to pass. Example use::
+    """Test must raise one of expected exceptions to pass.
+
+    Example use::
 
       @raises(TypeError, ValueError)
       def test_raises_type_error():
@@ -66,6 +68,9 @@ def raises(*exceptions):
       @raises(Exception):
       def test_that_fails_by_passing():
           pass
+
+    If you want to test many assertions about exceptions in a single test,
+    you may want to use `assert_raises` instead.
     """
     valid = ' or '.join([e.__name__ for e in exceptions])
     def decorate(func):
@@ -98,7 +103,9 @@ def set_trace():
     
 
 def timed(limit):
-    """Test must finish within specified time limit to pass. Example use::
+    """Test must finish within specified time limit to pass.
+
+    Example use::
 
       @timed(.1)
       def test_that_fails():
diff --git a/nose/twistedtools.py b/nose/twistedtools.py
index ddd3b6d..b3c8979 100644
--- a/nose/twistedtools.py
+++ b/nose/twistedtools.py
@@ -86,7 +86,8 @@ def deferred(timeout=None):
     If the callback is triggered, the test has passed.
     If the errback is triggered or the timeout expires, the test has failed.
 
-    Example:
+    Example::
+    
         @deferred(timeout=5.0)
         def test_resolve():
             return reactor.resolve("nose.python-hosting.com")
@@ -94,13 +95,15 @@ def deferred(timeout=None):
     Attention! If you combine this decorator with other decorators (like
     "raises"), deferred() must be called *first*!
 
-    In other words, this is good:
+    In other words, this is good::
+        
         @raises(DNSLookupError)
         @deferred()
         def test_error():
             return reactor.resolve("xxxjhjhj.biz")
 
-    and this is bad:
+    and this is bad::
+        
         @deferred()
         @raises(DNSLookupError)
         def test_error():
diff --git a/nose/util.py b/nose/util.py
index 24f5dd8..325c0ba 100644
--- a/nose/util.py
+++ b/nose/util.py
@@ -79,6 +79,7 @@ def file_like(name):
 
 def cmp_lineno(a, b):
     """Compare functions by their line numbers.
+    
     >>> cmp_lineno(isgenerator, ispackage)
     -1
     >>> cmp_lineno(ispackage, isgenerator)
diff --git a/scripts/mkdocs.py b/scripts/mkdocs.py
index 70e3658..52c5482 100755
--- a/scripts/mkdocs.py
+++ b/scripts/mkdocs.py
@@ -5,14 +5,19 @@ import time
 from docutils.core import publish_string, publish_parts
 from docutils.readers.standalone import Reader
 from pudge.browser import Browser
+from epydoc.objdoc import _lookup_class_field
 import inspect
 import nose
 import textwrap
 from optparse import OptionParser
-from nose.util import resolve_name
+from nose.util import resolve_name, odict
 
 ## FIXME: menu needs sections
 
+def defining_class(cls, attr):
+    val, container = _lookup_class_field(cls, attr)
+    return container.value()
+
 
 def write(filename, tpl, ctx):
     print filename
@@ -22,6 +27,9 @@ def write(filename, tpl, ctx):
 
 
 def doc_word(node):
+
+    # FIXME handle links like package.module and module.Class
+    
     print "Unknown ref %s" % node.astext()    
     node['refuri'] = '_'.join(
         map(lambda s: s.lower(), node.astext().split(' '))) + '.html'
@@ -36,6 +44,25 @@ class DocReader(Reader):
     unknown_reference_resolvers = (doc_word,)
 
 
+def formatargspec(func, exclude=()):
+    try:
+        args, varargs, varkw, defaults = inspect.getargspec(func)
+    except TypeError:
+        return "(...)"
+    if defaults:
+        defaults = map(clean_default, defaults)
+    for a in exclude:
+        if a in args:
+            ix = args.index(a)
+            args.remove(a)
+            try:
+                defaults.pop(ix)
+            except AttributeError:
+                pass
+    return inspect.formatargspec(
+        args, varargs, varkw, defaults).replace("'os.environ'", 'os.environ')
+
+
 def clean_default(val):
     if isinstance(val, os._Environ):
         return 'os.environ'
@@ -47,53 +74,162 @@ def to_html(rst):
     return parts['body']
 
 
-def format_class(cls):
-    print "  %s" % cls.name
-    doc = to_html(cls.doc())
-    html = ['<div class="cls section">',
-            '<span class="cls name">%s</span>' % cls.name,
+def document_module(mod):
+    name = mod.qualified_name()
+    print name
+    body =  to_html(mod.doc())
+
+    # FIXME prepend with note on what highlighted means
+
+    # FIXME need to have some notion of aliased classes
+    # eg defaultSelector = Selector, and modules
+    # should be able to set order of classes in docs
+
+    # classes
+    classes = [document_class(cls) for cls in get_classes(mod)]
+    if classes:
+        body += '<h2>Classes</h2>\n' + '\n'.join(classes)
+
+    # functions
+    funcs = [document_function(func) for func in mod.routines()]
+    if funcs:
+        body += '<h2>Functions</h2>\n' + '\n'.join(funcs)
+
+    # FIXME attributes
+
+    # FIXME add classes, funcs and attributes to submenu
+
+    pg = {'body': body,
+          'title': name}
+    pg.update(std_info)
+    to_write.append(('Module: %s' % name,
+                     os.path.join(doc, 'module_%s.html' % name),
+                     tpl, pg))    
+
+
+def get_classes(mod):
+    # some "invisible" items I do want, but not others
+    # really only those classes defined in the module itself
+    # with some per-module alias list handling (eg,
+    # TestLoader and defaultTestLoader shouldn't both be fully doc'd)
+    all = list(mod.classes(visible_only=0))
+
+    # sort by place in __all__
+    names = odict() # list comprehension didn't work? possible bug in odict
+    for c in all:
+        if c is not None and not c.isalias():
+            names[c.name] = c
+    ordered = []
+    try:
+        for name in mod.obj.__all__:
+            if name in names:
+                cls = names[name]
+                del names[name]
+                if cls is not None:
+                    ordered.append(cls)
+    except AttributeError:
+        pass    
+    for name, cls in names.items():
+        ordered.append(cls)
+    wanted = []
+    classes = set([])
+    for cls in ordered:
+        if cls.obj in classes:
+            cls.alias_for = cls.obj
+        else:
+            classes.add(cls.obj)
+        wanted.append(cls)    
+    return wanted
+
+
+def document_class(cls):
+    print "  %s" % cls.qualified_name()
+    alias = False
+    if hasattr(cls, 'alias_for'):
+        alias = True
+        doc = '(Alias for %s)' % link_to_class(cls.alias_for)
+    else:
+        doc = to_html(cls.doc())
+    bases = ', '.join(link_to_class(c) for c in cls.obj.__bases__)
+    html = ['<a name="%s"></a><div class="cls section">' % cls.name,
+            '<span class="cls name">%s</span> (%s)' % (cls.name, bases),
             '<div class="cls doc">%s' % doc]
 
-    methods = list(cls.routines(visible_only=False))
-    if methods:
-        methods.sort(lambda a, b: cmp(a.name, b.name))
-        html.append('<h4>Methods</h4>')
-        for method in methods:
-            if method.isvisible():
-                inherited = ''
-            else:
-                inherited = '<span class="method inherited">' \
-                            '(FIXME: inherited)</span>'                
-            html.extend([
-                '<div class="method section">',
-                '<span class="method name">%s</span>' % method.name,
-                '<span class="method args">%s</span>' % method.formatargs(),
-                inherited,
-                '<div class="method doc">%s</div>' % to_html(method.doc()),
-                '</div>'])
-
-    attrs = list(cls.attributes(visible_only=False))
-    if attrs:
-        attrs.sort(lambda a, b: cmp(a.name, b.name))
-        html.append('<h4>Attributes</h4>')
-        for attr in attrs:
-            if attr.isvisible():
-                inherited = ''
-            else:
-                inherited = '<span class="attr inherited">' \
-                            '(FIXME: inherited)</span>'
-            html.extend([
-                '<div class="attr section">',
-                '<span class="attr name">%s</span>' % attr.name,
-                '<span class="attr value">%(a)s</span>' % {'a': getattr(attr.parent.obj, attr.name)},
-                '<div class="attr doc">%s</div>' % attr.doc(),
-                '</div>'])
+    if not alias:
+        real_class = cls.obj
+        methods = list(cls.routines(visible_only=False))
+        if methods:
+            methods.sort(lambda a, b: cmp(a.name, b.name))
+            html.append('<h4>Methods</h4>')
+            for method in methods:
+                print "    %s" % method.qualified_name()
+                defined_in = defining_class(real_class, method.name)
+                if defined_in == real_class:
+                    inherited = ''
+                    inh_cls = ''
+                else:
+                    inherited = '<span class="method inherited">' \
+                                '(FIXME: inherited from %s)</span>' \
+                                % defined_in.__name__
+                    inh_cls = ' inherited'
+                html.extend([
+                    '<div class="method section%s">' % inh_cls, 
+                    '<span class="method name">%s</span>' % method.name,
+                    '<span class="method args">%s</span>'
+                    % formatargspec(method.obj),
+                    inherited,
+                    '<div class="method doc">%s</div>' % to_html(method.doc()),
+                    '</div>'])
+
+        attrs = list(cls.attributes(visible_only=False))
+        if attrs:
+            attrs.sort(lambda a, b: cmp(a.name, b.name))
+            html.append('<h4>Attributes</h4>')
+            for attr in attrs:
+                if defined_in == real_class:
+                    inherited = ''
+                    inh_cls = ''
+                else:
+                    inherited = '<span class="attr inherited">' \
+                                '(FIXME: inherited from %s)</span>' \
+                                % defined_in.__name__
+                    inh_cls = ' inherited'
+                html.extend([
+                    '<div class="attr section%s">' % inh_cls,
+                    '<span class="attr name">%s</span>' % attr.name,
+                    '<span class="attr value">%(a)s</span>' %
+                    {'a': getattr(attr.parent.obj, attr.name)},
+                    '<div class="attr doc">%s</div>' % to_html(attr.doc()),
+                    '</div>'])
 
     html.append('</div></div>')
 
     return ''.join(html)
 
-    
+
+def document_function(func):
+    print "  %s" % func.name
+    html = [
+        '<a name="%s"></a><div class="func section">' % func.name,
+        '<span class="func name">%s</span>' % func.name,
+        '<span class="func args">%s</span>'
+        % formatargspec(func.obj, exclude=['self']),
+        '<div class="func doc">%s</div>' % to_html(func.doc()),
+        '</div>']
+    return ''.join(html)
+
+
+def link_to_class(cls):
+    mod = cls.__module__
+    name = cls.__name__
+    if mod.startswith('_'):
+        qname = name
+    else:
+        qname = "%s.%s" % (mod, name)
+    if not mod.startswith('nose'):
+        return qname
+    return '<a href="module_%s.html#%s">%s</a>' % (mod, name, name)
+
 
 root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 doc = os.path.join(root, 'doc')
@@ -164,11 +300,7 @@ for m in methods:
     # padding evens the lines
     print name
     mdoc = {'body': to_html(textwrap.dedent('        ' + meth.__doc__))}
-    args, varargs, varkw, defaults = inspect.getargspec(meth)
-    if defaults:
-        defaults = map(clean_default, defaults)
-    argspec = inspect.formatargspec(
-        args, varargs, varkw, defaults).replace("'os.environ'", 'os.environ')
+    argspec = formatargspec(meth)
     mdoc.update({'name': name,
                  'extra_class': ' '.join(ec),
                  'arg': argspec})
@@ -242,21 +374,7 @@ for mod in b.modules(recursive=1):
         # no need to regenerate, this is the source of the doc index page
         continue
     print mod.qualified_name()
-    body = to_html(mod.doc())
-    # FIXME
-    # some "invisible" items I do want, but not others
-    # really only those classes defined in the module itself
-    # with some per-module alias list handling (eg,
-    # TestLoader and defaultTestLoader shouldn't both be fully doc'd)
-    classes = [format_class(cls) for cls in mod.classes()]
-    if classes:
-        body += '<h2>Classes</h2>\n' + '\n'.join(classes)
-    pg = {'body': body,
-          'title': mod.qualified_name()}
-    pg.update(std_info)
-    to_write.append(('Module: %s' % mod.qualified_name(),
-                     os.path.join(doc, 'module_%s.html' % mod.qualified_name()),
-                     tpl, pg))    
+    document_module(mod)
 
     
 menu = [ '<li><a href="%s">%s</a></li>' % (os.path.basename(filename), title)