Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
3e0a1eb8
Commit
3e0a1eb8
authored
May 28, 2012
by
Richard Oudkerk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #14930: Make memoryview objects weakrefable.
parent
1cfe7d9a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
2 deletions
+23
-2
Include/memoryobject.h
Include/memoryobject.h
+1
-0
Lib/test/test_memoryview.py
Lib/test/test_memoryview.py
+15
-0
Lib/test/test_sys.py
Lib/test/test_sys.py
+1
-1
Misc/NEWS
Misc/NEWS
+2
-0
Objects/memoryobject.c
Objects/memoryobject.c
+4
-1
No files found.
Include/memoryobject.h
View file @
3e0a1eb8
...
...
@@ -63,6 +63,7 @@ typedef struct {
Py_ssize_t
exports
;
/* number of buffer re-exports */
Py_buffer
view
;
/* private copy of the exporter's view */
char
format
[
_Py_MEMORYVIEW_MAX_FORMAT
];
/* used for casting */
PyObject
*
weakreflist
;
Py_ssize_t
ob_array
[
1
];
/* shape, strides, suboffsets */
}
PyMemoryViewObject
;
#endif
...
...
Lib/test/test_memoryview.py
View file @
3e0a1eb8
...
...
@@ -336,6 +336,21 @@ class AbstractMemoryTests:
m
=
self
.
_view
(
b
)
self
.
assertRaises
(
ValueError
,
hash
,
m
)
def
test_weakref
(
self
):
# Check memoryviews are weakrefable
for
tp
in
self
.
_types
:
b
=
tp
(
self
.
_source
)
m
=
self
.
_view
(
b
)
L
=
[]
def
callback
(
wr
,
b
=
b
):
L
.
append
(
b
)
wr
=
weakref
.
ref
(
m
,
callback
)
self
.
assertIs
(
wr
(),
m
)
del
m
test
.
support
.
gc_collect
()
self
.
assertIs
(
wr
(),
None
)
self
.
assertIs
(
L
[
0
],
b
)
# Variations on source objects for the buffer: bytes-like objects, then arrays
# with itemsize > 1.
# NOTE: support for multi-dimensional objects is unimplemented.
...
...
Lib/test/test_sys.py
View file @
3e0a1eb8
...
...
@@ -778,7 +778,7 @@ class SizeofTest(unittest.TestCase):
check
(
int
(
PyLong_BASE
**
2
-
1
),
size
(
vh
)
+
2
*
self
.
longdigit
)
check
(
int
(
PyLong_BASE
**
2
),
size
(
vh
)
+
3
*
self
.
longdigit
)
# memoryview
check
(
memoryview
(
b''
),
size
(
h
+
'PPiP4P2i5P3cP'
))
check
(
memoryview
(
b''
),
size
(
h
+
'PPiP4P2i5P3c
2
P'
))
# module
check
(
unittest
,
size
(
h
+
'3P'
))
# None
...
...
Misc/NEWS
View file @
3e0a1eb8
...
...
@@ -10,6 +10,8 @@ What's New in Python 3.3.0 Alpha 4?
Core and Builtins
-----------------
- Issue #14930: Make memoryview objects weakrefable.
- Issue #14775: Fix a potential quadratic dict build-up due to the garbage
collector repeatedly trying to untrack dicts.
...
...
Objects/memoryobject.c
View file @
3e0a1eb8
...
...
@@ -595,6 +595,7 @@ memory_alloc(int ndim)
mv
->
view
.
shape
=
mv
->
ob_array
;
mv
->
view
.
strides
=
mv
->
ob_array
+
ndim
;
mv
->
view
.
suboffsets
=
mv
->
ob_array
+
2
*
ndim
;
mv
->
weakreflist
=
NULL
;
_PyObject_GC_TRACK
(
mv
);
return
mv
;
...
...
@@ -969,6 +970,8 @@ memory_dealloc(PyMemoryViewObject *self)
_PyObject_GC_UNTRACK
(
self
);
(
void
)
_memory_release
(
self
);
Py_CLEAR
(
self
->
mbuf
);
if
(
self
->
weakreflist
!=
NULL
)
PyObject_ClearWeakRefs
((
PyObject
*
)
self
);
PyObject_GC_Del
(
self
);
}
...
...
@@ -2608,7 +2611,7 @@ PyTypeObject PyMemoryView_Type = {
(
traverseproc
)
memory_traverse
,
/* tp_traverse */
(
inquiry
)
memory_clear
,
/* tp_clear */
memory_richcompare
,
/* tp_richcompare */
0
,
/* tp_weaklistoffset */
offsetof
(
PyMemoryViewObject
,
weakreflist
),
/* tp_weaklistoffset */
0
,
/* tp_iter */
0
,
/* tp_iternext */
memory_methods
,
/* tp_methods */
...
...
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