AppPkg/.../Python-2.7.10: Update file for Python-2.7.10 inclusion.

[mirror_edk2.git] / AppPkg / Applications / Python / Python-2.7.10 / PyMod-2.7.10 / Modules / edk2module.c

diff --git a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c
index bce08ab9d2dd0f061d7cc34a4edc383c855d7321..11a376055e14a43af3c3da62d1c25b4d8d660a1c 100644 (file)
--- a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c
+++ b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c
@@ -2,6 +2,7 @@
     OS-specific module implementation for EDK II and UEFI.\r
     Derived from posixmodule.c in Python 2.7.2.\r
 \r
+    Copyright (c) 2015, Daryl McDaniel. All rights reserved.<BR>\r
     Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
     This program and the accompanying materials are licensed and made available under\r
     the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -2248,6 +2249,7 @@ edk2_getpid(PyObject *self, PyObject *noargs)
     return PyLong_FromPid(getpid());\r
 }\r
 \r
+\r
 #ifdef HAVE_GETLOGIN\r
 PyDoc_STRVAR(edk2_getlogin__doc__,\r
 "getlogin() -> string\n\n\\r
@@ -2340,7 +2342,6 @@ PyDoc_STRVAR(edk2_popen__doc__,
 "popen(command [, mode='r' [, bufsize]]) -> pipe\n\n\\r
 Open a pipe to/from a command returning a file object.");\r
 \r
-/* standard posix version of popen() support */\r
 static PyObject *\r
 edk2_popen(PyObject *self, PyObject *args)\r
 {\r
@@ -2369,6 +2370,7 @@ edk2_popen(PyObject *self, PyObject *args)
 \r
 #endif /* HAVE_POPEN */\r
 \r
+\r
 #if defined(HAVE_WAIT3) || defined(HAVE_WAIT4)\r
 static PyObject *\r
 wait_helper(pid_t pid, int status, struct rusage *ru)\r
@@ -4187,9 +4189,6 @@ INITFUNC(void)
     if (all_ins(m))\r
         return;\r
 \r
-    if (setup_confname_tables(m))\r
-        return;\r
-\r
     Py_INCREF(PyExc_OSError);\r
     PyModule_AddObject(m, "error", PyExc_OSError);\r
 \r