diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-05-28 15:21:19 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-05-28 15:21:19 -0700 |
| commit | aa1cfce920ecef6b7c8a4a70dbd3c04c4037dceb (patch) | |
| tree | feb777dee930ba97fb00acab5548ee868e8a7b69 /numpy/core/numeric.py | |
| parent | 15c2d0ddb6bb96ba89da96e8373059804d33118d (diff) | |
| parent | 5448d7fbdc4111c80763ae519c7007982b1a6830 (diff) | |
| download | numpy-aa1cfce920ecef6b7c8a4a70dbd3c04c4037dceb.tar.gz | |
Merge pull request #3371 from juliantaylor/mmap-slice-improve
Mmap slice improve
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index a187d7c5b..bb2f3d28d 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -40,7 +40,7 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc', 'Inf', 'inf', 'infty', 'Infinity', 'nan', 'NaN', 'False_', 'True_', 'bitwise_not', 'CLIP', 'RAISE', 'WRAP', 'MAXDIMS', 'BUFSIZE', 'ALLOW_THREADS', - 'ComplexWarning'] + 'ComplexWarning', 'may_share_memory'] if sys.version_info[0] < 3: __all__.extend(['getbuffer', 'newbuffer']) @@ -252,6 +252,7 @@ fromstring = multiarray.fromstring fromiter = multiarray.fromiter fromfile = multiarray.fromfile frombuffer = multiarray.frombuffer +may_share_memory = multiarray.may_share_memory if sys.version_info[0] < 3: newbuffer = multiarray.newbuffer getbuffer = multiarray.getbuffer |