[Python-3000-checkins] r58687 - in python/branches/py3k: Lib/plat-mac/ic.py Mac/Modules/file/_Filemodule.c

neal.norwitz python-3000-checkins at python.org
Sat Oct 27 08:04:52 CEST 2007


Author: neal.norwitz
Date: Sat Oct 27 08:04:52 2007
New Revision: 58687

Modified:
   python/branches/py3k/Lib/plat-mac/ic.py
   python/branches/py3k/Mac/Modules/file/_Filemodule.c
Log:
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.


Modified: python/branches/py3k/Lib/plat-mac/ic.py
==============================================================================
--- python/branches/py3k/Lib/plat-mac/ic.py	(original)
+++ python/branches/py3k/Lib/plat-mac/ic.py	Sat Oct 27 08:04:52 2007
@@ -65,7 +65,7 @@
     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

Modified: python/branches/py3k/Mac/Modules/file/_Filemodule.c
==============================================================================
--- python/branches/py3k/Mac/Modules/file/_Filemodule.c	(original)
+++ python/branches/py3k/Mac/Modules/file/_Filemodule.c	Sat Oct 27 08:04:52 2007
@@ -1312,7 +1312,7 @@
 	        PyMac_Error(err);
 	        return NULL;
 	}
-	_res = PyString_FromString(strbuf);
+	_res = PyUnicode_FromString(strbuf);
 	return _res;
 
 }


More information about the Python-3000-checkins mailing list