From 7c52933d59fe13438c65482cbf9ffab00d5e2cac Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Mon, 16 Feb 2009 08:53:24 +0000 Subject: [PATCH] Fixed _has_webpage_extension() with help and gentle nudging from Kees Bakker. svn: r12004 --- src/plugins/webreport/WebCal.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 035064927..34c9e6fb7 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -400,7 +400,7 @@ class WebCalReport(Report): if not (url.startswith('http:') or url.startswith('/')): url = '/'.join(subdirs + [url_fname]) - if not _has_webpage_extension(url, self.ext): + if not _has_webpage_extension(url): url += self.ext # Figure out if we need
  • or just plain
  • @@ -756,7 +756,7 @@ class WebCalReport(Report): fname = os.path.join(self.html_dir, subdir, fname) - if not _has_webpage_extension(fname, self.ext): + if not _has_webpage_extension(fname): fname += self.ext destdir = os.path.dirname(fname) @@ -1562,16 +1562,16 @@ def get_next_day(year, month, day_col): return next_month_day # TODO. Eliminate this function, or make it do something useful. -def _has_webpage_extension(url, ext): +def _has_webpage_extension(url): """ determine if a filename has an extension or not... url = filename to be checked - ext -- extension to process if there is one or not """ - if url.endswith(ext): - return True + for ext in ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi']: + if url.endswith(ext): + return True return False #-------------------------------------------------------------------------