summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-08-25 10:29:39 -0500
committerGitHub <noreply@github.com>2016-08-25 10:29:39 -0500
commit6849fa3bea1384c5ed2d49a6e57a602e51a1c15b (patch)
treed7e496528b2633c4358de946bec30068b9efda0e /numpy/core
parentd92c75b46fa316a7711049c278bfb4d4f11b2349 (diff)
parentaaf86b51e2519d0b769461263b6a64bb87f15e0d (diff)
downloadnumpy-6849fa3bea1384c5ed2d49a6e57a602e51a1c15b.tar.gz
Merge pull request #7943 from theultimatecrouton/doc_fix
DOC: #7927. Remove deprecated note for memmap relevant for Python <2.5
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/memmap.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py
index 5f6182742..6fa845277 100644
--- a/numpy/core/memmap.py
+++ b/numpy/core/memmap.py
@@ -102,11 +102,8 @@ class memmap(ndarray):
The memmap object can be used anywhere an ndarray is accepted.
Given a memmap ``fp``, ``isinstance(fp, numpy.ndarray)`` returns
``True``.
-
- Memory-mapped arrays use the Python memory-map object which
- (prior to Python 2.5) does not allow files to be larger than a
- certain size depending on the platform. This size is always < 2GB
- even on 64-bit systems.
+
+ Memory-mapped files cannot be larger than 2GB on 32-bit systems.
When a memmap causes a file to be created or extended beyond its
current size in the filesystem, the contents of the new part are