[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6.

[stefan.krah]

https://hg.python.org/cpython/rev/e1e6b34d7613
changeset:   106032:e1e6b34d7613
parent:      106030:6439f3c4288a
parent:      106031:9c4ed0bbe523
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Jan 08 01:11:50 2017 +0100
summary:
  Merge 3.6.

files:
  Modules/_testbuffer.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -13,7 +13,7 @@
 PyObject *calcsize = NULL;
 
 /* cache simple format string */
-static const char simple_fmt[] = "B";
+static const char *simple_fmt = "B";
 PyObject *simple_format = NULL;
 #define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0)
 #define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt)

-- 
Repository URL: https://hg.python.org/cpython