diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-02 21:58:05 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2008-08-02 21:58:05 (GMT) |
| commit | 92a624019867885028fe0b326457b461e672eb3b (patch) | |
| tree | c7b9f682618db83a5d5b2bd2980356fc7ecb948b | |
| parent | 727bd0b6874b32a42762251888cdfc2484286867 (diff) | |
| download | cpython-92a624019867885028fe0b326457b461e672eb3b.zip cpython-92a624019867885028fe0b326457b461e672eb3b.tar.gz cpython-92a624019867885028fe0b326457b461e672eb3b.tar.bz2 | |
Preemptively backport the relevant parts of r65420
| -rw-r--r-- | Lib/test/test_str.py | 3 | ||||
| -rw-r--r-- | Objects/stringobject.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py index 535e66a..044711c 100644 --- a/Lib/test/test_str.py +++ b/Lib/test/test_str.py @@ -364,6 +364,9 @@ class StrTest( self.assertRaises(ValueError, format, "", "-") self.assertRaises(ValueError, "{0:=s}".format, '') + def test_buffer_is_readonly(self): + self.assertRaises(TypeError, sys.stdin.readinto, b"") + def test_main(): test_support.run_unittest(StrTest) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 0d2ceb1..6d53a09 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1329,7 +1329,7 @@ static int string_buffer_getbuffer(PyStringObject *self, Py_buffer *view, int flags) { return PyBuffer_FillInfo(view, (void *)self->ob_sval, Py_SIZE(self), - 0, flags); + 1, flags); } static PySequenceMethods string_as_sequence = { |