Fixed _has_webpage_extension() with help and gentle nudging from Kees Bakker.
svn: r12004
This commit is contained in:
		@@ -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 <li id="CurrentSection"> or just plain <li>
 | 
			
		||||
@@ -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,14 +1562,14 @@ 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
 | 
			
		||||
    """
 | 
			
		||||
 | 
			
		||||
    for ext in ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi']:
 | 
			
		||||
        if url.endswith(ext):
 | 
			
		||||
            return True
 | 
			
		||||
    return False
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user