Merged revisions 64095 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64095 | amaury.forgeotdarc | 2008-06-10 16:37:15 -0500 (Tue, 10 Jun 2008) | 3 lines

  Correct test_pydoc for win32 platforms, to account for normalized URLs:
  C:\temp => file:///C|temp/
........

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index ab1b083b4851e6e8097d3827ce7eb31a43e6bb52..8b30e268c0a1313fdf5c70dd30d6e2df926d7f26 100644 (file)
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -231,7 +231,12 @@ class PyDocDocTest(unittest.TestCase):
     def test_html_doc(self):
         result, doc_loc = get_pydoc_html(pydoc_mod)
         mod_file = inspect.getabsfile(pydoc_mod)
-        expected_html = expected_html_pattern % (mod_file, mod_file, doc_loc)
+        if sys.platform == 'win32':
+            import nturl2path
+            mod_url = nturl2path.pathname2url(mod_file)
+        else:
+            mod_url = mod_file
+        expected_html = expected_html_pattern % (mod_url, mod_file, doc_loc)
         if result != expected_html:
             print_diffs(expected_html, result)
             self.fail("outputs are not equal, see diff above")