summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathaniel J. Smith <njs@pobox.com>2016-04-06 23:32:36 +0000
committerNathaniel J. Smith <njs@pobox.com>2016-04-06 23:32:36 +0000
commitac21efdd9d5d69198bc0802645826a4b1240952a (patch)
treeabf85da164eb8ddb0a7eb9020b0f2b48b39a457b
parent537d35c2cf49cae0a496c37564fa282ec80e3695 (diff)
parent5da86095cd08aa8b25505f7f78ad2a9a10a8d103 (diff)
downloadnumpy-ac21efdd9d5d69198bc0802645826a4b1240952a.tar.gz
Merge pull request #7521 from matthew-brett/rephrase-mmap-changes
DOC: rephrase writeup of memmap changes
-rw-r--r--doc/release/1.12.0-notes.rst12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst
index b9e405154..084f6bac5 100644
--- a/doc/release/1.12.0-notes.rst
+++ b/doc/release/1.12.0-notes.rst
@@ -183,10 +183,14 @@ methods in this module are called with keyword arguments instead.
Operations on np.memmap objects return numpy arrays in most cases
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Previously operations on a memmap (e.g. adding 1 to it) object would
-misleadingly return a memmap instance even if the result was actually
-not memmapped. Also reduction of a memmap (e.g. ``.sum(axis=None``)
-return a numpy scalar instead of a 0d memmap.
+Previously operations on a memmap object would misleadingly return a memmap
+instance even if the result was actually not memmapped. For example,
+``arr + 1`` or ``arr + arr`` would return memmap instances, although no memory
+from the output array is memmaped. Version 1.12 returns ordinary numpy arrays
+from these operations.
+
+Also, reduction of a memmap (e.g. ``.sum(axis=None``) now returns a numpy
+scalar instead of a 0d memmap.
Deprecations
============