From 044e156426825acac8b6c6d1ce14d5b7bcb20bc9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 10 Jul 2017 23:12:37 +0200 Subject: [PATCH] bpo-30892: Fix _elementtree module initialization (#2647) (#2649) Handle getattr(copy, 'deepcopy') error in _elementtree module initialization. (cherry picked from commit b136f11f3a51f9282ae992bac68f170ca5563b55) --- Modules/_elementtree.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index bef702ebe6..599ca6a4cc 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3947,6 +3947,11 @@ PyInit__elementtree(void) st->deepcopy_obj = PyObject_GetAttrString(temp, "deepcopy"); Py_XDECREF(temp); + if (st->deepcopy_obj == NULL) { + return NULL; + } + + assert(!PyErr_Occurred()); if (!(st->elementpath_obj = PyImport_ImportModule("xml.etree.ElementPath"))) return NULL; -- 2.40.0