summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2016-12-30 11:24:59 (GMT)
committerStefan Krah <skrah@bytereef.org>2016-12-30 11:24:59 (GMT)
commit089a062da4ad9973013fc216603033f5f6a23b73 (patch)
tree77c58656ea089638fdc2317ea974586fd2f25c68
parentfd5fe14acb28b5d0b3bc211945ed20f338c9cde9 (diff)
parenta50006c9773e80542a8d7a4cf3dad332e16c30fc (diff)
downloadcpython-089a062da4ad9973013fc216603033f5f6a23b73.zip
cpython-089a062da4ad9973013fc216603033f5f6a23b73.tar.gz
cpython-089a062da4ad9973013fc216603033f5f6a23b73.tar.bz2
Merge 3.6.
-rw-r--r--Objects/memoryobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 428d83c..b1798a2 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -221,7 +221,7 @@ PyTypeObject _PyManagedBuffer_Type = {
PyDoc_STRVAR(memory_doc,
-"memoryview($module, object)\n--\n\
+"memoryview(object)\n--\n\
\n\
Create a new memoryview object which references the given object.");