updating to cElementTree 1.0.5 (step 3 of 3)

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index fe479cfdcacf67a198588c58f91d08b1f61c99b6..4ba70c7ce43285232b446e5af035543b4875fbbf 100644 (file)
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -41,6 +41,9 @@
  * http://www.pythonware.com
  */
 
+/* Licensed to PSF under a Contributor Agreement. */
+/* See http://www.python.org/2.4/license for licensing details. */
+
 #include "Python.h"
 
 #define VERSION "1.0.5"
@@ -2568,7 +2571,7 @@ static PyMethodDef _functions[] = {
 };
 
 DL_EXPORT(void)
-initcElementTree(void)
+init_elementtree(void)
 {
     PyObject* m;
     PyObject* g;
@@ -2583,7 +2586,7 @@ initcElementTree(void)
     XMLParser_Type.ob_type = &PyType_Type;
 #endif
 
-    m = Py_InitModule("cElementTree", _functions);
+    m = Py_InitModule("_elementtree", _functions);
 
     /* python glue code */
 
@@ -2600,13 +2603,13 @@ initcElementTree(void)
         "from copy import copy, deepcopy\n"
 
         "try:\n"
-        "  from elementtree import ElementTree\n"
+        "  from xml.etree import ElementTree\n"
         "except ImportError:\n"
         "  import ElementTree\n"
         "ET = ElementTree\n"
         "del ElementTree\n"
 
-        "import cElementTree\n"
+        "import _elementtree as cElementTree\n"
 
         "try:\n" /* check if copy works as is */
         "  copy(cElementTree.Element('x'))\n"