[Python-checkins] python/dist/src/Lib/test test_pep292.py,1.7,1.8

Mon Nov 1 04:52:46 CET 2004

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25882/Lib/test
Modified Files:
	test_pep292.py 
Log Message:
SF patch #1056967, changes the semantics of Template.safe_substitute() to not
raise a ValueError for dangling delimiters (the delimiter itself is returned).
Index: test_pep292.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pep292.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8

--- test_pep292.py	17 Oct 2004 16:27:18 -0000	1.7
+++ test_pep292.py	1 Nov 2004 03:52:43 -0000	1.8
@@ -163,20 +163,19 @@
 raises(TypeError, s.safe_substitute, d, {})
 
 def test_delimiter_override(self):
+ eq = self.assertEqual
+ raises = self.assertRaises
 class AmpersandTemplate(Template):
 delimiter = '&'
 s = AmpersandTemplate('this &gift is for &{who} &&')
- self.assertEqual(s.substitute(gift='bud', who='you'),
- 'this bud is for you &')
- self.assertRaises(KeyError, s.substitute)
- self.assertEqual(s.safe_substitute(gift='bud', who='you'),
- 'this bud is for you &')
- self.assertEqual(s.safe_substitute(),
- 'this &gift is for &{who} &')
+ eq(s.substitute(gift='bud', who='you'), 'this bud is for you &')
+ raises(KeyError, s.substitute)
+ eq(s.safe_substitute(gift='bud', who='you'), 'this bud is for you &')
+ eq(s.safe_substitute(), 'this &gift is for &{who} &')
 s = AmpersandTemplate('this &gift is for &{who} &')
- self.assertRaises(ValueError, s.substitute,
- dict(gift='bud', who='you'))
- self.assertRaises(ValueError, s.safe_substitute)
+ raises(ValueError, s.substitute, dict(gift='bud', who='you'))
+ eq(s.safe_substitute(), 'this &gift is for &{who} &')
+
 
 def test_main():
 from test import test_support
