From: Xiang Zhang Date: Sun, 22 Jan 2017 05:10:12 +0000 (+0800) Subject: Issue #29092: Merge 3.6. X-Git-Tag: v3.7.0a1~1492 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dfaa6c38aa8607a29728db209072a5c95481bc1;p=python Issue #29092: Merge 3.6. --- 1dfaa6c38aa8607a29728db209072a5c95481bc1 diff --cc Modules/clinic/posixmodule.c.h index c88716f111,0d3ce6eed6..39ac7fd54f --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@@ -6492,4 -6150,4 +6493,4 @@@ exit #ifndef OS_GETRANDOM_METHODDEF #define OS_GETRANDOM_METHODDEF #endif /* !defined(OS_GETRANDOM_METHODDEF) */ - /*[clinic end generated code: output=30cdd28fc524f2fb input=a9049054013a1b77]*/ -/*[clinic end generated code: output=455def991740915a input=a9049054013a1b77]*/ ++/*[clinic end generated code: output=5a0be969e3f71660 input=a9049054013a1b77]*/