From a22c98de8507b18ed0c0933f81e6b0ab63467d11 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 31 May 2011 18:59:49 -0500
Subject: [PATCH] simply use the Python version for pyexpat.__version__ #12221

---
 Misc/NEWS         | 10 ++++++++++
 Modules/pyexpat.c | 26 +++++---------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 3982b2bdd70..ed70507c62c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,16 @@
 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?
 ===============================================
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index cc62274d148..7c610a81ca7 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1730,26 +1730,6 @@ static struct PyMethodDef pyexpat_methods[] = {
 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
@@ -1790,6 +1770,7 @@ MODULE_INITFUNC(void)
     PyObject *errors_module;
     PyObject *modelmod_name;
     PyObject *model_module;
+    PyObject *version;
     PyObject *sys_modules;
     static struct PyExpat_CAPI capi;
     PyObject* capi_object;
@@ -1822,7 +1803,10 @@ MODULE_INITFUNC(void)
     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());
     {