From 14a29fb0157ccec6c755e4eefe805c6324b3641d Mon Sep 17 00:00:00 2001 From: calvin Date: Thu, 18 May 2006 21:35:36 +0000 Subject: [PATCH] prepare filenames as URLs git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3264 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/checker/tests/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/linkcheck/checker/tests/__init__.py b/linkcheck/checker/tests/__init__.py index c057503d..0582dd4b 100644 --- a/linkcheck/checker/tests/__init__.py +++ b/linkcheck/checker/tests/__init__.py @@ -102,9 +102,8 @@ def get_file (filename=None): return unicode(directory) -def get_file_url (): - filename = get_file().replace("\\", "/") - return re.sub("^file://(/?)([a-zA-Z]):", r"file:///\2|", filename) +def get_file_url (filename): + return re.sub("^([a-zA-Z]):", r"/\1|", filename.replace("\\", "/")) def get_test_aggregate (confargs, logargs): @@ -143,8 +142,8 @@ class LinkCheckTest (unittest.TestCase): ignoring empty lines and lines starting with a hash sign (#). """ resultfile = get_file(filename+".result") - d = {'curdir': os.getcwd(), - 'datadir': get_file_url(), + d = {'curdir': get_file_url(os.getcwd()), + 'datadir': get_file_url(get_file()), } f = codecs.open(resultfile, "r", "iso-8859-15") resultlines = [line.rstrip('\r\n') % d for line in f \