[Python-checkins] cpython (merge 3.6 -> default): Issue #28156: Merge from 3.6
berker.peksag
python-checkins at python.org
Thu Sep 15 13:46:32 EDT 2016
https://hg.python.org/cpython/rev/33834105048e
changeset: 103826:33834105048e
parent: 103824:8fad3f283a15
parent: 103825:d17ff867580f
user: Berker Peksag <berker.peksag at gmail.com>
date: Thu Sep 15 20:47:28 2016 +0300
summary:
Issue #28156: Merge from 3.6
files:
Modules/clinic/posixmodule.c.h | 10 +++++++++-
Modules/posixmodule.c | 2 ++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -2349,6 +2349,8 @@
#endif /* defined(HAVE_GETGID) */
+#if defined(HAVE_GETPID)
+
PyDoc_STRVAR(os_getpid__doc__,
"getpid($module, /)\n"
"--\n"
@@ -2367,6 +2369,8 @@
return os_getpid_impl(module);
}
+#endif /* defined(HAVE_GETPID) */
+
#if defined(HAVE_GETGROUPS)
PyDoc_STRVAR(os_getgroups__doc__,
@@ -5841,6 +5845,10 @@
#define OS_GETGID_METHODDEF
#endif /* !defined(OS_GETGID_METHODDEF) */
+#ifndef OS_GETPID_METHODDEF
+ #define OS_GETPID_METHODDEF
+#endif /* !defined(OS_GETPID_METHODDEF) */
+
#ifndef OS_GETGROUPS_METHODDEF
#define OS_GETGROUPS_METHODDEF
#endif /* !defined(OS_GETGROUPS_METHODDEF) */
@@ -6140,4 +6148,4 @@
#ifndef OS_GETRANDOM_METHODDEF
#define OS_GETRANDOM_METHODDEF
#endif /* !defined(OS_GETRANDOM_METHODDEF) */
-/*[clinic end generated code: output=dfa6bc9d1f2db750 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b9ed5703d2feb0d9 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5895,6 +5895,7 @@
#endif /* HAVE_GETGID */
+#ifdef HAVE_GETPID
/*[clinic input]
os.getpid
@@ -5907,6 +5908,7 @@
{
return PyLong_FromPid(getpid());
}
+#endif /* HAVE_GETPID */
#ifdef HAVE_GETGROUPLIST
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list