Skip to content

Commit 5c350af

Browse files
author
Engelbert Gruber
committed
makeHtmlBase: re.sub under python 2.2 didn't replace '.', string.replace does.
1 parent 8fd7f52 commit 5c350af

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Feature:
1010
. you can now use the roundup-admin tool pack the database
1111

1212
Fixed:
13+
. makeHtmlBase: re.sub under python 2.2 did not replace '.', string.replace does it.
14+
. preamble in tepmlateBuilder mentioned htmldata
1315
. mailgw checks encoding on first part too.
1416
. the mail gateway now responds with an error message when invalid values
1517
for arguments are specified for link or mutlilink properties

roundup/templatebuilder.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: templatebuilder.py,v 1.13 2001-11-22 15:46:42 jhermann Exp $
18+
# $Id: templatebuilder.py,v 1.14 2002-02-05 09:59:05 grubert Exp $
1919
import errno, re
2020

2121
__doc__ = """
@@ -24,7 +24,7 @@
2424

2525
preamble = """
2626
# Do Not Edit (Unless You Want To)
27-
# This file automagically generated by roundup.htmldata.makeHtmlBase
27+
# This file automagically generated by roundup.templatebuilder.makeHtmlBase
2828
#
2929
"""
3030

@@ -41,7 +41,7 @@ def makeHtmlBase(templateDir):
4141
for file in filelist:
4242
# skip the backup files created by richard's vim
4343
if file[-1] == '~': continue
44-
mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file))
44+
mangled_name = os.path.basename(file).replace('.','DOT')
4545
fd.write('%s = """'%mangled_name)
4646
fd.write(re.sub(r'\$((Id|File|Log).*?)\$', r'dollar\1dollar',
4747
open(file).read(), re.I))
@@ -89,6 +89,9 @@ def installHtmlBase(template, installDir):
8989

9090
#
9191
# $Log: not supported by cvs2svn $
92+
# Revision 1.13 2001/11/22 15:46:42 jhermann
93+
# Added module docstrings to all modules.
94+
#
9295
# Revision 1.12 2001/11/14 21:35:21 richard
9396
# . users may attach files to issues (and support in ext) through the web now
9497
#

0 commit comments

Comments
 (0)