Get a bunch of tests working on Mac OS. I suspect that a bunch of the

ord()s in Lib/plat-mac/ic.py need to be removed.

diff --git a/Lib/plat-mac/ic.py b/Lib/plat-mac/ic.py
index 769400ae8eac59869bfca547543f5d432b0a2953..ba2146122f034046c6eba376aa7b14d10b7e9238 100644 (file)
--- a/Lib/plat-mac/ic.py
+++ b/Lib/plat-mac/ic.py
@@ -65,7 +65,7 @@ def _decode_fontrecord(data, key):
     return size, face, data[5:5+namelen]
 
 def _decode_boolean(data, key):
-    return ord(data[0])
+    return data[0]
 
 def _decode_text(data, key):
     return data

diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c
index 0ca9e3bd9affc6a4a306b8d51255ce8a408a0787..ffc16d5badc48040fe22ebd93adf14f510612d23 100644 (file)
--- a/Mac/Modules/file/_Filemodule.c
+++ b/Mac/Modules/file/_Filemodule.c
@@ -1312,7 +1312,7 @@ static PyObject *FSSpec_as_pathname(FSSpecObject *_self, PyObject *_args)
                PyMac_Error(err);
                return NULL;
        }
-       _res = PyString_FromString(strbuf);
+       _res = PyUnicode_FromString(strbuf);
        return _res;
 
 }