Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
80467731
Commit
80467731
authored
Oct 17, 2018
by
Андрей Парамонов
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unset PyBUF_WRITABLE when creating MemoryView for assignment source
parent
5dfefdad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletion
+31
-1
Cython/Utility/MemoryView.pyx
Cython/Utility/MemoryView.pyx
+1
-1
tests/memoryview/memoryview.pyx
tests/memoryview/memoryview.pyx
+30
-0
No files found.
Cython/Utility/MemoryView.pyx
View file @
80467731
...
...
@@ -426,7 +426,7 @@ cdef class memoryview(object):
cdef
is_slice
(
self
,
obj
):
if
not
isinstance
(
obj
,
memoryview
):
try
:
obj
=
memoryview
(
obj
,
self
.
flags
|
PyBUF_ANY_CONTIGUOUS
,
obj
=
memoryview
(
obj
,
self
.
flags
&
~
PyBUF_WRITABLE
|
PyBUF_ANY_CONTIGUOUS
,
self
.
dtype_is_object
)
except
TypeError
:
return
None
...
...
tests/memoryview/memoryview.pyx
View file @
80467731
...
...
@@ -14,6 +14,9 @@ from cpython.object cimport PyObject
from
cpython.ref
cimport
Py_INCREF
,
Py_DECREF
cimport
cython
import
array
as
pyarray
from
libc.stdlib
cimport
malloc
,
free
cdef
extern
from
"Python.h"
:
cdef
int
PyBUF_C_CONTIGUOUS
...
...
@@ -1083,3 +1086,30 @@ def optimised_index_of_slice(int[:,:,:] arr, int x, int y, int z):
print
(
arr
[
x
,
y
,
z
],
arr
[
x
][:][:][
y
][:][:][
z
])
print
(
arr
[
x
,
y
,
z
],
arr
[:][
x
][:][
y
][:][:][
z
])
print
(
arr
[
x
,
y
,
z
],
arr
[:,
:][
x
][:,
:][
y
][:][
z
])
def
test_assign_from_byteslike
(
byteslike
):
"""
>>> test_assign_from_byteslike(bytes(b'hello'))
b'hello'
>>> test_assign_from_byteslike(bytearray(b'howdy'))
b'howdy'
>>> test_assign_from_byteslike(pyarray.array('B', b'aloha'))
b'aloha'
>>> test_assign_from_byteslike(memoryview(b'bye!!'))
b'bye!!'
"""
cdef
void
*
buf
cdef
unsigned
char
[:]
mview
buf
=
malloc
(
5
)
try
:
mview
=
<
unsigned
char
[:
5
]
>
(
buf
)
def
assign
(
b
):
b
[:]
=
byteslike
assign
(
mview
)
return
bytes
(
mview
)
finally
:
free
(
buf
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment