Commit 70e82215 authored by Guido van Rossum's avatar Guido van Rossum

Folded long lines.

parent 36a93e30
...@@ -97,7 +97,8 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly) ...@@ -97,7 +97,8 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly)
if ( (*pb->bf_getsegcount)(base, NULL) != 1 ) if ( (*pb->bf_getsegcount)(base, NULL) != 1 )
{ {
PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected"); PyErr_SetString(PyExc_TypeError,
"single-segment buffer object expected");
return NULL; return NULL;
} }
if ( (count = (*proc)(base, 0, &p)) < 0 ) if ( (count = (*proc)(base, 0, &p)) < 0 )
...@@ -135,7 +136,8 @@ PyBuffer_FromObject(base, offset, size) ...@@ -135,7 +136,8 @@ PyBuffer_FromObject(base, offset, size)
return NULL; return NULL;
} }
return _PyBuffer_FromObject(base, offset, size, pb->bf_getreadbuffer, 1); return _PyBuffer_FromObject(base, offset, size,
pb->bf_getreadbuffer, 1);
} }
PyObject * PyObject *
...@@ -154,7 +156,9 @@ PyBuffer_FromReadWriteObject(base, offset, size) ...@@ -154,7 +156,9 @@ PyBuffer_FromReadWriteObject(base, offset, size)
return NULL; return NULL;
} }
return _PyBuffer_FromObject(base, offset, size, (getreadbufferproc)pb->bf_getwritebuffer, 0); return _PyBuffer_FromObject(base, offset, size,
(getreadbufferproc)pb->bf_getwritebuffer,
0);
} }
PyObject * PyObject *
...@@ -322,7 +326,8 @@ buffer_concat(self, other) ...@@ -322,7 +326,8 @@ buffer_concat(self, other)
if ( (*pb->bf_getsegcount)(other, NULL) != 1 ) if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
{ {
/* ### use a different exception type/message? */ /* ### use a different exception type/message? */
PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected"); PyErr_SetString(PyExc_TypeError,
"single-segment buffer object expected");
return NULL; return NULL;
} }
...@@ -416,7 +421,8 @@ buffer_slice(self, left, right) ...@@ -416,7 +421,8 @@ buffer_slice(self, left, right)
} }
if ( right < left ) if ( right < left )
right = left; right = left;
return PyString_FromStringAndSize((char *)self->b_ptr + left, right - left); return PyString_FromStringAndSize((char *)self->b_ptr + left,
right - left);
} }
static int static int
...@@ -452,7 +458,8 @@ buffer_ass_item(self, idx, other) ...@@ -452,7 +458,8 @@ buffer_ass_item(self, idx, other)
if ( (*pb->bf_getsegcount)(other, NULL) != 1 ) if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
{ {
/* ### use a different exception type/message? */ /* ### use a different exception type/message? */
PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected"); PyErr_SetString(PyExc_TypeError,
"single-segment buffer object expected");
return -1; return -1;
} }
...@@ -497,7 +504,8 @@ buffer_ass_slice(self, left, right, other) ...@@ -497,7 +504,8 @@ buffer_ass_slice(self, left, right, other)
if ( (*pb->bf_getsegcount)(other, NULL) != 1 ) if ( (*pb->bf_getsegcount)(other, NULL) != 1 )
{ {
/* ### use a different exception type/message? */ /* ### use a different exception type/message? */
PyErr_SetString(PyExc_TypeError, "single-segment buffer object expected"); PyErr_SetString(PyExc_TypeError,
"single-segment buffer object expected");
return -1; return -1;
} }
if ( (count = (*pb->bf_getreadbuffer)(other, 0, &p)) < 0 ) if ( (count = (*pb->bf_getreadbuffer)(other, 0, &p)) < 0 )
...@@ -514,7 +522,8 @@ buffer_ass_slice(self, left, right, other) ...@@ -514,7 +522,8 @@ buffer_ass_slice(self, left, right, other)
slice_len = right - left; slice_len = right - left;
if ( count != slice_len ) { if ( count != slice_len ) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(
PyExc_TypeError,
"right operand length must match slice length"); "right operand length must match slice length");
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment