Changeset 391 for python/trunk/Python/importdl.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Python/importdl.c (modified) (2 diffs)

python/trunk/Python/importdl.c

@@ -14 +14 @@
 
 extern dl_funcptr _PyImport_GetDynLoadFunc(const char *name,
-                                           const char *shortname,
-                                           const char *pathname, FILE *fp);
+                                           const char *shortname,
+                                           const char *pathname, FILE *fp);
 
 
@@ -22 +22 @@
 _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
 {
-        PyObject *m;
-        char *lastdot, *shortname, *packagecontext, *oldcontext;
-        dl_funcptr p;
+    PyObject *m;
+    char *lastdot, *shortname, *packagecontext, *oldcontext;
+    dl_funcptr p;
 
-        if ((m = _PyImport_FindExtension(name, pathname)) != NULL) {
-                Py_INCREF(m);
-                return m;
-        }
-        lastdot = strrchr(name, '.');
-        if (lastdot == NULL) {
-                packagecontext = NULL;
-                shortname = name;
-        }
-        else {
-                packagecontext = name;
-                shortname = lastdot+1;
-        }
+    if ((m = _PyImport_FindExtension(name, pathname)) != NULL) {
+        Py_INCREF(m);
+        return m;
+    }
+    lastdot = strrchr(name, '.');
+    if (lastdot == NULL) {
+        packagecontext = NULL;
+        shortname = name;
+    }
+    else {
+        packagecontext = name;
+        shortname = lastdot+1;
+    }
 
-        p = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp);
-        if (PyErr_Occurred())
-                return NULL;
-        if (p == NULL) {
-                PyErr_Format(PyExc_ImportError,
-                   "dynamic module does not define init function (init%.200s)",
-                             shortname);
-                return NULL;
-        }
-        oldcontext = _Py_PackageContext;
-        _Py_PackageContext = packagecontext;
-        (*p)();
-        _Py_PackageContext = oldcontext;
-        if (PyErr_Occurred())
-                return NULL;
+    p = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp);
+    if (PyErr_Occurred())
+        return NULL;
+    if (p == NULL) {
+        PyErr_Format(PyExc_ImportError,
+           "dynamic module does not define init function (init%.200s)",
+                     shortname);
+        return NULL;
+    }
+    oldcontext = _Py_PackageContext;
+    _Py_PackageContext = packagecontext;
+    (*p)();
+    _Py_PackageContext = oldcontext;
+    if (PyErr_Occurred())
+        return NULL;
 
-        m = PyDict_GetItemString(PyImport_GetModuleDict(), name);
-        if (m == NULL) {
-                PyErr_SetString(PyExc_SystemError,
-                                "dynamic module not initialized properly");
-                return NULL;
-        }
-        /* Remember the filename as the __file__ attribute */
-        if (PyModule_AddStringConstant(m, "__file__", pathname) < 0)
-                PyErr_Clear(); /* Not important enough to report */
+    m = PyDict_GetItemString(PyImport_GetModuleDict(), name);
+    if (m == NULL) {
+        PyErr_SetString(PyExc_SystemError,
+                        "dynamic module not initialized properly");
+        return NULL;
+    }
+    /* Remember the filename as the __file__ attribute */
+    if (PyModule_AddStringConstant(m, "__file__", pathname) < 0)
+        PyErr_Clear(); /* Not important enough to report */
 
-        if (_PyImport_FixupExtension(name, pathname) == NULL)
-                return NULL;
-        if (Py_VerboseFlag)
-                PySys_WriteStderr(
-                        "import %s # dynamically loaded from %s\n",
-                        name, pathname);
-        Py_INCREF(m);
-        return m;
+    if (_PyImport_FixupExtension(name, pathname) == NULL)
+        return NULL;
+    if (Py_VerboseFlag)
+        PySys_WriteStderr(
+            "import %s # dynamically loaded from %s\n",
+            name, pathname);
+    Py_INCREF(m);
+    return m;
 }