From: grubert Date: Tue, 5 Feb 2002 09:59:05 +0000 (+0000) Subject: . makeHtmlBase: re.sub under python 2.2 did not replace '.', string.replace does it. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd1d3f220cd157d7d43658ffc3d5ca87ad6e1353;p=roundup.git . makeHtmlBase: re.sub under python 2.2 did not replace '.', string.replace does it. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@611 57a73879-2fb5-44c3-a270-3262357dd7e2 --- diff --git a/CHANGES.txt b/CHANGES.txt index 4382fb8..8307c0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,8 @@ Feature: . you can now use the roundup-admin tool pack the database Fixed: + . makeHtmlBase: re.sub under python 2.2 did not replace '.', string.replace does it. + . preamble in tepmlateBuilder mentioned htmldata . mailgw checks encoding on first part too. . the mail gateway now responds with an error message when invalid values for arguments are specified for link or mutlilink properties diff --git a/roundup/templatebuilder.py b/roundup/templatebuilder.py index 358cfdc..79b1f1b 100644 --- a/roundup/templatebuilder.py +++ b/roundup/templatebuilder.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: templatebuilder.py,v 1.13 2001-11-22 15:46:42 jhermann Exp $ +# $Id: templatebuilder.py,v 1.14 2002-02-05 09:59:05 grubert Exp $ import errno, re __doc__ = """ @@ -24,7 +24,7 @@ Collect template parts and create instance template files. preamble = """ # Do Not Edit (Unless You Want To) -# This file automagically generated by roundup.htmldata.makeHtmlBase +# This file automagically generated by roundup.templatebuilder.makeHtmlBase # """ @@ -41,7 +41,7 @@ def makeHtmlBase(templateDir): for file in filelist: # skip the backup files created by richard's vim if file[-1] == '~': continue - mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file)) + mangled_name = os.path.basename(file).replace('.','DOT') fd.write('%s = """'%mangled_name) fd.write(re.sub(r'\$((Id|File|Log).*?)\$', r'dollar\1dollar', open(file).read(), re.I)) @@ -89,6 +89,9 @@ if __name__ == "__main__": # # $Log: not supported by cvs2svn $ +# Revision 1.13 2001/11/22 15:46:42 jhermann +# Added module docstrings to all modules. +# # Revision 1.12 2001/11/14 21:35:21 richard # . users may attach files to issues (and support in ext) through the web now #