From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 27 Oct 2007 06:04:52 +0000 (+0000)
Subject: Get a bunch of tests working on Mac OS.  I suspect that a bunch of the
X-Git-Tag: v3.0a2~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9;p=thirdparty%2FPython%2Fcpython.git

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 769400ae8eac..ba2146122f03 100644
--- 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 0ca9e3bd9aff..ffc16d5badc4 100644
--- 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;
 
 }