From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 03:01:17 +0000 (+0000)
Subject: Issue #23738: Merge 3.5 into 3.6
X-Git-Tag: v3.6.0a1~1632
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a122b5a1fdecb8b131e1773a30e94021f32a90bc;p=python

Issue #23738: Merge 3.5 into 3.6
---

a122b5a1fdecb8b131e1773a30e94021f32a90bc
diff --cc Modules/clinic/posixmodule.c.h
index a7045a87bc,9ef702a297..a48de6ac88
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@@ -5792,4 -5788,4 +5792,4 @@@ exit
  #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF
      #define OS_SET_HANDLE_INHERITABLE_METHODDEF
  #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */
- /*[clinic end generated code: output=35b50461dbecd65d input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=95824c52fd034654 input=a9049054013a1b77]*/
++/*[clinic end generated code: output=a5c9bef9ad11a20b input=a9049054013a1b77]*/