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
1d108bc7
Commit
1d108bc7
authored
Mar 19, 2013
by
Kristján Valur Jónsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #10211 : Buffer object should support the new buffer interface.
parent
acb6e858
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
2 deletions
+21
-2
Lib/test/test_buffer.py
Lib/test/test_buffer.py
+8
-0
Objects/bufferobject.c
Objects/bufferobject.c
+13
-2
No files found.
Lib/test/test_buffer.py
View file @
1d108bc7
...
...
@@ -21,6 +21,14 @@ class BufferTests(unittest.TestCase):
self
.
assertEqual
(
b
[
start
:
stop
:
step
],
s
[
start
:
stop
:
step
])
def
test_newbuffer_interface
(
self
):
# Test that the buffer object has the new buffer interface
# as used by the memoryview object
s
=
""
.
join
(
chr
(
c
)
for
c
in
list
(
range
(
255
,
-
1
,
-
1
)))
b
=
buffer
(
s
)
m
=
memoryview
(
b
)
# Should not raise an exception
self
.
assertEqual
(
m
.
tobytes
(),
s
)
def
test_main
():
with
test_support
.
check_py3k_warnings
((
"buffer.. not supported"
,
...
...
Objects/bufferobject.c
View file @
1d108bc7
...
...
@@ -802,6 +802,16 @@ buffer_getcharbuf(PyBufferObject *self, Py_ssize_t idx, const char **pp)
return
size
;
}
static
int
buffer_getbuffer
(
PyBufferObject
*
self
,
Py_buffer
*
buf
,
int
flags
)
{
void
*
ptr
;
Py_ssize_t
size
;
if
(
!
get_buf
(
self
,
&
ptr
,
&
size
,
ANY_BUFFER
))
return
-
1
;
return
PyBuffer_FillInfo
(
buf
,
(
PyObject
*
)
self
,
ptr
,
size
,
self
->
b_readonly
,
flags
);
}
static
PySequenceMethods
buffer_as_sequence
=
{
(
lenfunc
)
buffer_length
,
/*sq_length*/
(
binaryfunc
)
buffer_concat
,
/*sq_concat*/
...
...
@@ -823,6 +833,7 @@ static PyBufferProcs buffer_as_buffer = {
(
writebufferproc
)
buffer_getwritebuf
,
(
segcountproc
)
buffer_getsegcount
,
(
charbufferproc
)
buffer_getcharbuf
,
(
getbufferproc
)
buffer_getbuffer
,
};
PyTypeObject
PyBuffer_Type
=
{
...
...
@@ -845,7 +856,7 @@ PyTypeObject PyBuffer_Type = {
PyObject_GenericGetAttr
,
/* tp_getattro */
0
,
/* tp_setattro */
&
buffer_as_buffer
,
/* tp_as_buffer */
Py_TPFLAGS_DEFAULT
|
Py_TPFLAGS_HAVE_GETCHARBUFFER
,
/* tp_flags */
Py_TPFLAGS_DEFAULT
|
Py_TPFLAGS_HAVE_GETCHARBUFFER
|
Py_TPFLAGS_HAVE_NEWBUFFER
,
/* tp_flags */
buffer_doc
,
/* tp_doc */
0
,
/* tp_traverse */
0
,
/* tp_clear */
...
...
@@ -864,4 +875,4 @@ PyTypeObject PyBuffer_Type = {
0
,
/* tp_init */
0
,
/* tp_alloc */
buffer_new
,
/* tp_new */
};
};
\ No newline at end of file
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