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

[jvr at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21212

Modified Files:
	plistlib.py 
Log Message:
reordered a couple of things

Index: plistlib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/plistlib.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- plistlib.py	26 Oct 2004 10:30:55 -0000	1.15
+++ plistlib.py	12 Nov 2004 08:02:35 -0000	1.16
@@ -61,6 +61,7 @@
 import binascii
 import datetime
 from cStringIO import StringIO
+import re
 
 
 def readPlist(pathOrFile):
@@ -176,11 +177,6 @@
             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
 # (in particular, YYYY '-' MM '-' DD 'T' HH ':' MM ':' SS 'Z'.  Smaller units may be omitted with
 #  a loss of precision)
@@ -203,6 +199,11 @@
         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):
     text = text.replace("\r\n", "\n")       # convert DOS line endings
     text = text.replace("\r", "\n")         # convert Mac line endings