diff options
| author | Daryl McDaniel <edk2-lists@mc2research.org> | 2015-12-23 00:07:43 +0000 |
|---|---|---|
| committer | darylm503 <darylm503@Edk2> | 2015-12-23 00:07:43 +0000 |
| commit | 5285ac3eba73d3f6ad8cf356a0a8815fe97b3cf3 (patch) | |
| tree | 097ca623c56bf5cf9503807644ac317ec7122b4a /AppPkg | |
| parent | 42fa19ca9a795cdea9cb33ae48647ca9cd9ff84f (diff) | |
| download | edk2-5285ac3eba73d3f6ad8cf356a0a8815fe97b3cf3.tar.gz edk2-5285ac3eba73d3f6ad8cf356a0a8815fe97b3cf3.tar.bz2 edk2-5285ac3eba73d3f6ad8cf356a0a8815fe97b3cf3.zip | |
AppPkg/.../Python-2.7.10: Update file for Python-2.7.10 inclusion.
Add copyright message.
Add some blank lines.
Remove a superfluous call to setup_confname_tables(m) from INITFUNC().
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <edk2-lists@mc2research.org>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19461 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg')
| -rw-r--r-- | AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 bce08ab9d2..11a376055e 100644 --- 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.
Derived from posixmodule.c in Python 2.7.2.
+ Copyright (c) 2015, Daryl McDaniel. All rights reserved.<BR>
Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
@@ -2248,6 +2249,7 @@ edk2_getpid(PyObject *self, PyObject *noargs) return PyLong_FromPid(getpid());
}
+
#ifdef HAVE_GETLOGIN
PyDoc_STRVAR(edk2_getlogin__doc__,
"getlogin() -> string\n\n\
@@ -2340,7 +2342,6 @@ PyDoc_STRVAR(edk2_popen__doc__, "popen(command [, mode='r' [, bufsize]]) -> pipe\n\n\
Open a pipe to/from a command returning a file object.");
-/* standard posix version of popen() support */
static PyObject *
edk2_popen(PyObject *self, PyObject *args)
{
@@ -2369,6 +2370,7 @@ edk2_popen(PyObject *self, PyObject *args) #endif /* HAVE_POPEN */
+
#if defined(HAVE_WAIT3) || defined(HAVE_WAIT4)
static PyObject *
wait_helper(pid_t pid, int status, struct rusage *ru)
@@ -4187,9 +4189,6 @@ INITFUNC(void) if (all_ins(m))
return;
- if (setup_confname_tables(m))
- return;
-
Py_INCREF(PyExc_OSError);
PyModule_AddObject(m, "error", PyExc_OSError);
|