[wwwsearch-commits] r32798 - in wwwsearch/mechanize/trunk: . mechanize

[jjlee at codespeak.net]

Author: jjlee
Date: Sun Oct  1 20:39:27 2006
New Revision: 32798

Modified:
   wwwsearch/mechanize/trunk/mechanize/_mechanize.py
   wwwsearch/mechanize/trunk/test.py
Log:
Revert accidental commit 32797, yawn

Modified: wwwsearch/mechanize/trunk/mechanize/_mechanize.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/_mechanize.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/_mechanize.py	Sun Oct  1 20:39:27 2006
@@ -138,14 +138,6 @@
             self._response.close()
         return self._mech_open(url, data)
 
-    def open_no_visit(self):
-        """Open without visiting the URL.
-
-        Useful for downloading image and CSS files, robots.txt, etc.
-
-        """
-        return self._mech_open(url, data)
-
     def _mech_open(self, url, data=None, update_history=True):
         try:
             url.get_full_url

Modified: wwwsearch/mechanize/trunk/test.py
==============================================================================
--- wwwsearch/mechanize/trunk/test.py	(original)
+++ wwwsearch/mechanize/trunk/test.py	Sun Oct  1 20:39:27 2006
@@ -58,6 +58,7 @@
         self.testLoader = testLoader
         self.progName = os.path.basename(argv[0])
         self.parseArgs(argv)
+        self.runTests()
 
     def usageExit(self, msg=None):
         if msg: print msg
@@ -98,7 +99,7 @@
         if self.testRunner is None:
             self.testRunner = TextTestRunner(verbosity=self.verbosity)
         result = self.testRunner.run(self.test)
-        return result
+        sys.exit(not result.wasSuccessful())
 
 
 if __name__ == "__main__":
@@ -109,11 +110,6 @@
 
     # XXX temporary stop-gap to run doctests
 
-    # XXXX coverage output seems incorrect ATM
-    run_coverage = '-c' in sys.argv
-    if run_coverage:
-        sys.argv.remove("-c")
-
     # import local copy of Python 2.5 doctest
     assert os.path.isdir("test")
     sys.path.insert(0, "test")
@@ -126,12 +122,6 @@
     sys.path.insert(0, "test-tools")
     import doctest
 
-    import coverage
-    if run_coverage:
-        print 'running coverage'
-        coverage.erase()
-        coverage.start()
-
     import mechanize
 
     # run .doctest files needing special support
@@ -173,23 +163,4 @@
     import unittest
     test_path = os.path.join(os.path.dirname(sys.argv[0]), "test")
     sys.path.insert(0, test_path)
-    prog = TestProgram(MODULE_NAMES)
-    result = prog.runTests()
-
-    if run_coverage:
-        # HTML coverage report
-        import colorize
-        from mechanize import _mechanize
-        try:
-            os.mkdir("coverage")
-        except OSError:
-            pass
-        f, s, m, mf = coverage.analysis(_mechanize)
-        fo = open(os.path.join('coverage', os.path.basename(f)+'.html'), 'wb')
-        colorize.colorize_file(f, outstream=fo, not_covered=mf)
-        fo.close()
-        coverage.report(_mechanize)
-        #print coverage.analysis(_mechanize)
-
-    # XXX exit status is wrong -- does not take account of doctests
-    sys.exit(not result.wasSuccessful())
+    TestProgram(MODULE_NAMES)