summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-10-27 06:04:52 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-10-27 06:04:52 (GMT)
commit96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9 (patch)
tree3456186efc999797f4870272fa24885d416675ef
parent3d7a90dea101021f846173b03b3d0a9c25a9d6b1 (diff)
downloadcpython-96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9.zip
cpython-96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9.tar.gz
cpython-96bf3cc3fcf48b47230d13bb07d45abc17ea6ac9.tar.bz2
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.
-rw-r--r--Lib/plat-mac/ic.py2
-rw-r--r--Mac/Modules/file/_Filemodule.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/plat-mac/ic.py b/Lib/plat-mac/ic.py
index 769400a..ba21461 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 0ca9e3b..ffc16d5 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;
}