[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1 (#12221)
benjamin.peterson
python-checkins at python.org
Wed Jun 1 02:08:30 CEST 2011
http://hg.python.org/cpython/rev/f2f74b8d6767
changeset: 70563:f2f74b8d6767
branch: 3.2
parent: 70554:0f2714e49583
parent: 70562:9c23efa3f5c7
user: Benjamin Peterson <benjamin at python.org>
date: Tue May 31 19:06:17 2011 -0500
summary:
merge 3.1 (#12221)
files:
Misc/NEWS | 5 +++++
Modules/pyexpat.c | 26 +++++---------------------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,11 @@
- Issue #12065: connect_ex() on an SSL socket now returns the original errno
when the socket's timeout expires (it used to return None).
+Extension Modules
+-----------------
+
+- Issue #12221: Replace pyexpat.__version__ with the Python version.
+
Build
-----
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1621,26 +1621,6 @@
PyDoc_STRVAR(pyexpat_module_documentation,
"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 */
#ifndef MODULE_NAME
@@ -1681,6 +1661,7 @@
PyObject *errors_module;
PyObject *modelmod_name;
PyObject *model_module;
+ PyObject *version;
PyObject *sys_modules;
PyObject *tmpnum, *tmpstr;
PyObject *codes_dict;
@@ -1717,7 +1698,10 @@
Py_INCREF(&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",
(char *) XML_ExpatVersion());
{
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list