- \f is not a valid XML character

- reformatted regex pattern, use r"" consistently

diff --git a/Lib/plat-mac/plistlib.py b/Lib/plat-mac/plistlib.py
index 574b45f5a45d8a28376c91b3673a3fb90679bc80..f73214dd5632cf25153ee66fd259834d255fb450 100644 (file)
--- a/Lib/plat-mac/plistlib.py
+++ b/Lib/plat-mac/plistlib.py
@@ -200,9 +200,10 @@ def _dateToString(d):
     )
 
 
-# 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