mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

simply use the Python version for pyexpat.__version__ #12221

Browse source
This commit is contained in:
Benjamin Peterson 2011-05-31 18:59:49 -05:00
parent bb11bb0dbb
commit a22c98de85
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Misc/NEWS
View file

@ -2,6 +2,16 @@
Python News Python News
+++++++++++ +++++++++++
What's New in Python 3.1.4?
===========================
*Release date: 2011-05-XX*
Extension Modules
-----------------
- Issue #12221: Replace pyexpat.__version__ with the Python version.
What's New in Python 3.1.4 release candidate 1? What's New in Python 3.1.4 release candidate 1?
=============================================== ===============================================

26
Modules/pyexpat.c
View file

@ -1730,26 +1730,6 @@ static struct PyMethodDef pyexpat_methods[] = {
PyDoc_STRVAR(pyexpat_module_documentation, PyDoc_STRVAR(pyexpat_module_documentation,
"Python wrapper for Expat parser."); "Python wrapper for Expat parser.");
/* Return a Python string that represents the version number without the
* extra cruft added by revision control, even if the right options were
* given to the "cvs export" command to make it not include the extra
* cruft.
*/
static PyObject *
get_version_string(void)
{
static char *rcsid = "$Revision$";
char *rev = rcsid;
int i = 0;
while (!isdigit(Py_CHARMASK(*rev)))
++rev;
while (rev[i] != ' ' && rev[i] != '\0')
++i;
return PyUnicode_FromStringAndSize(rev, i);
}
/* Initialization function for the module */ /* Initialization function for the module */
#ifndef MODULE_NAME #ifndef MODULE_NAME
@ -1790,6 +1770,7 @@ MODULE_INITFUNC(void)
PyObject *errors_module; PyObject *errors_module;
PyObject *modelmod_name; PyObject *modelmod_name;
PyObject *model_module; PyObject *model_module;
PyObject *version;
PyObject *sys_modules; PyObject *sys_modules;
static struct PyExpat_CAPI capi; static struct PyExpat_CAPI capi;
PyObject* capi_object; PyObject* capi_object;
@ -1822,7 +1803,10 @@ MODULE_INITFUNC(void)
Py_INCREF(&Xmlparsetype); Py_INCREF(&Xmlparsetype);
PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype); PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);
PyModule_AddObject(m, "__version__", get_version_string()); version = PyUnicode_FromString(PY_VERSION);
if (!version)
return;
PyModule_AddObject(m, "__version__", version);
PyModule_AddStringConstant(m, "EXPAT_VERSION", PyModule_AddStringConstant(m, "EXPAT_VERSION",
(char *) XML_ExpatVersion()); (char *) XML_ExpatVersion());
{ {