commit 5cf40083364e1d2dce119de25cb42ce69d2fb53c
author Behdad Esfahbod <behdad@behdad.org> Wed Nov 27 19:51:59 2013 -0500
committer Behdad Esfahbod <behdad@behdad.org> Thu Nov 28 17:32:43 2013 -0500
tree 588d2c4ddfc9d6a5cd33876bdfe6acdbd113e59b
parent b7fd2e19138b177403689bdd6989cfd2402aa2b3

py23 tostr()/tobytes() and using them

ttf->xml seems to be mostly working now.

Lib/fontTools/misc/xmlWriter.py

diff --git a/Lib/fontTools/misc/xmlWriter.py b/Lib/fontTools/misc/xmlWriter.py
index 4efd3f6..a1ba65f 100644
--- a/Lib/fontTools/misc/xmlWriter.py
+++ b/Lib/fontTools/misc/xmlWriter.py
@@ -2,6 +2,7 @@
 
 from __future__ import print_function, division
 from fontTools.misc.py23 import *
+import sys
 import string
 import struct
 
@@ -122,17 +123,18 @@
 	
 
 def escape(data):
+	data = tostr(data)
 	data = data.replace("&", "&")
 	data = data.replace("<", "&lt;")
 	return data
 
 def escapeattr(data):
-	data = data.replace("&", "&amp;")
-	data = data.replace("<", "&lt;")
+	data = escape(data)
 	data = data.replace('"', "&quot;")
 	return data
 
 def escape8bit(data):
+	data = tostr(data)
 	def escapechar(c):
 		n = byteord(c)
 		if c in "<&":
@@ -146,13 +148,11 @@
 			return "&#" + repr(n) + ";"
 	return "".join(map(escapechar, data))
 
-needswap = struct.pack("h", 1) == "\001\000"
-
 def escape16bit(data):
 	import array
 	a = array.array("H")
 	a.fromstring(data)
-	if needswap:
+	if sys.byteorder != "big":
 		a.byteswap()
 	def escapenum(n, amp=byteord("&"), lt=byteord("<")):
 		if n == amp:
@@ -160,7 +160,7 @@
 		elif n == lt:
 			return "&lt;"
 		elif 32 <= n <= 127:
-			return bytechr(n)
+			return chr(n)
 		else:
 			return "&#" + repr(n) + ";"
 	return "".join(map(escapenum, a))