From: Lisandro Dalcin <dalcinl@gmail.com>
Date: Mon, 12 Apr 2010 20:48:59 +0000 (-0300)
Subject: rename local variable __import__ -> py_import in utility code
X-Git-Tag: 0.13.beta0~218
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c733d9774427e31a293dc55b3e1ce9ebfbf5bf10;p=cython.git

rename local variable __import__ -> py_import in utility code
---

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 93757edc..cb4a688d 100755
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -6287,14 +6287,14 @@ static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 """,
 impl = """
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
-    PyObject *__import__ = 0;
+    PyObject *py_import = 0;
     PyObject *empty_list = 0;
     PyObject *module = 0;
     PyObject *global_dict = 0;
     PyObject *empty_dict = 0;
     PyObject *list;
-    __import__ = __Pyx_GetAttrString(%(BUILTINS)s, "__import__");
-    if (!__import__)
+    py_import = __Pyx_GetAttrString(%(BUILTINS)s, "__import__");
+    if (!py_import)
         goto bad;
     if (from_list)
         list = from_list;
@@ -6310,11 +6310,11 @@ static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
     empty_dict = PyDict_New();
     if (!empty_dict)
         goto bad;
-    module = PyObject_CallFunctionObjArgs(__import__,
+    module = PyObject_CallFunctionObjArgs(py_import,
         name, global_dict, empty_dict, list, NULL);
 bad:
     Py_XDECREF(empty_list);
-    Py_XDECREF(__import__);
+    Py_XDECREF(py_import);
     Py_XDECREF(empty_dict);
     return module;
 }