merge 3.1

This commit is contained in:
Benjamin Peterson 2011-05-31 21:38:49 -05:00
commit fdb2d909a4

View File

@ -1700,7 +1700,7 @@ MODULE_INITFUNC(void)
version = PyUnicode_FromString(PY_VERSION);
if (!version)
return;
return NULL;
PyModule_AddObject(m, "__version__", version);
PyModule_AddStringConstant(m, "EXPAT_VERSION",
(char *) XML_ExpatVersion());