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

[stefan.krah]

https://hg.python.org/cpython/rev/223699bbff9b
changeset:   105902:223699bbff9b
parent:      105899:1c486516b39e
parent:      105901:c6989c3b228b
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Dec 30 12:24:59 2016 +0100
summary:
  Merge 3.6.

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


diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -221,7 +221,7 @@
 
 
 PyDoc_STRVAR(memory_doc,
-"memoryview($module, object)\n--\n\
+"memoryview(object)\n--\n\
 \n\
 Create a new memoryview object which references the given object.");
 

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