[Python-3000-checkins] r64283 - in python/branches/py3k: Lib/test/test_pydoc.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Jun 15 01:04:46 2008
New Revision: 64283

Log:
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/
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_pydoc.py

Modified: python/branches/py3k/Lib/test/test_pydoc.py
==============================================================================
--- python/branches/py3k/Lib/test/test_pydoc.py	(original)
+++ python/branches/py3k/Lib/test/test_pydoc.py	Sun Jun 15 01:04:46 2008
@@ -231,7 +231,12 @@
     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")