traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reordered a couple of things

This commit is contained in:
Just van Rossum 2004-11-12 08:02:35 +00:00
parent 441609466b
commit 26e811abd5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/plat-mac/plistlib.py
View File

@ -61,6 +61,7 @@ __all__ = [
import binascii import binascii
import datetime import datetime
from cStringIO import StringIO from cStringIO import StringIO
import re
def readPlist(pathOrFile): def readPlist(pathOrFile):
@ -176,11 +177,6 @@ class DumbXMLWriter:
self.file.write("\n") self.file.write("\n")
import re
# 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]")
# Contents should conform to a subset of ISO 8601 # Contents should conform to a subset of ISO 8601
# (in particular, YYYY '-' MM '-' DD 'T' HH ':' MM ':' SS 'Z'. Smaller units may be omitted with # (in particular, YYYY '-' MM '-' DD 'T' HH ':' MM ':' SS 'Z'. Smaller units may be omitted with
# a loss of precision) # a loss of precision)
@ -203,6 +199,11 @@ def _dateToString(d):
d.hour, d.minute, d.second d.hour, d.minute, d.second
) )
# 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]")
def _escapeAndEncode(text): def _escapeAndEncode(text):
text = text.replace("\r\n", "\n") # convert DOS line endings text = text.replace("\r\n", "\n") # convert DOS line endings
text = text.replace("\r", "\n") # convert Mac line endings text = text.replace("\r", "\n") # convert Mac line endings