]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:56:16 +0000 (11:56 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:56:16 +0000 (11:56 -0600)
1  2 
Doc/README.txt
Modules/_collectionsmodule.c
Modules/itertoolsmodule.c
Objects/setobject.c
README

diff --cc Doc/README.txt
Simple merge
index 4fffe01a84d84f90fb1bad5f3ad6fcf7316f14df,6115c702a9391e2f1db6c4b41d77d3d8ff63e112..1a334285c1662a95072e2c91a0d870a007aadb57
@@@ -1,16 -1,8 +1,14 @@@
  #include "Python.h"
  #include "structmember.h"
  
 +#ifdef STDC_HEADERS
 +#include <stddef.h>
 +#else
 +#include <sys/types.h>          /* For size_t */
 +#endif
 +
  /* collections module implementation of a deque() datatype
     Written and maintained by Raymond D. Hettinger <python@rcn.com>
-    Copyright (c) 2004-2015 Python Software Foundation.
-    All rights reserved.
  */
  
  /* The block length may be set to any number over 1.  Larger numbers
Simple merge
Simple merge
diff --cc README
Simple merge