[Python-checkins] python/dist/src/Lib/plat-mac plistlib.py, 1.16, 1.17

Fri Nov 12 09:14:52 CET 2004

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449
Modified Files:
	plistlib.py 
Log Message:
- \f is not a valid XML character
- reformatted regex pattern, use r"" consistently
Index: plistlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17

--- plistlib.py	12 Nov 2004 08:02:35 -0000	1.16
+++ plistlib.py	12 Nov 2004 08:14:49 -0000	1.17
@@ -200,9 +200,10 @@
 )
 
 
-# Regex to strip all control chars, but for \t \n \r and \f
-_controlStripper = re.compile(r"[\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0e\x0f"
- "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f]")
+# Regex to strip all control chars, but for \t \n and \r
+_controlStripper = re.compile(
+ r"[\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0e\x0f"
+ r"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f]")
 
 def _escapeAndEncode(text):
 text = text.replace("\r\n", "\n") # convert DOS line endings
