Mailman 3 March 2016 - Python-checkins

cpython: Issue #22854: Skip pipe seekable() tests on Windows
by martin.panter March 31, 2016

March 31, 2016

https://hg.python.org/cpython/rev/fb10d1f5016e changeset: 100810:fb10d1f5016e parent: 100808:c27e9dcad1a3 user: Martin Panter <vadmium+py(a)gmail.com> date: Thu Mar 31 10:31:30 2016 +0000 summary: Issue #22854: Skip pipe seekable() tests on Windows files: Lib/test/test_io.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -425,7 +425,12 @@ writable = "w" in abilities self.assertEqual(obj.writable(), writable) seekable = "s" in abilities - self.assertEqual(obj.seekable(), seekable) + + # Detection of pipes being non-seekable does not seem to work + # on Windows + if not sys.platform.startswith("win") or test not in ( + pipe_reader, pipe_writer): + self.assertEqual(obj.seekable(), seekable) if isinstance(obj, self.TextIOBase): data = "3" -- Repository URL: https://hg.python.org/cpython

1 0

GOOD Benchmark Results for Python 2.7 2016-03-31
by lp_benchmark_robot＠intel.com March 31, 2016

March 31, 2016

Results for project Python 2.7, build date 2016-03-31 03:05:54 +0000 commit: 249ef9d02aa6 previous commit: f4cff2bf9903 revision date: 2016-03-30 18:02:00 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v2.7.10, with hash 15c95b7d81dc from 2015-05-23 16:02:14+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.15% 1.43% 5.58% 4.01% :-) pybench 0.17% -0.44% 6.02% 5.06% :-( regex_v8 0.80% 0.24% -2.63% 11.12% :-) nbody 0.24% -0.49% 7.45% 2.85% :-) json_dump_v2 0.28% -0.74% 3.70% 11.28% :-( normal_startup 1.92% 0.32% -5.73% 2.26% :-) ssbench 0.23% 0.39% 2.47% 1.00% ---------------------------------------------------------------------------------- * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/good-benchmark-results-for-python-2-7… Note: Benchmark results for ssbench are measured in requests/second while all other are measured in seconds. Subject Label Legend: Attributes are determined based on the performance evolution of the workloads compared to the previous measurement iteration. NEUTRAL: performance did not change by more than 1% for any workload GOOD: performance improved by more than 1% for at least one workload and there is no regression greater than 1% BAD: performance dropped by more than 1% for at least one workload and there is no improvement greater than 1% UGLY: performance improved by more than 1% for at least one workload and also dropped by more than 1% for at least one workload Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

UGLY Benchmark Results for Python Default 2016-03-31
by lp_benchmark_robot＠intel.com March 31, 2016

March 31, 2016

Results for project Python default, build date 2016-03-31 02:13:30 +0000 commit: b6eebe7cf5ae previous commit: c83349c129c9 revision date: 2016-03-30 18:11:16 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v3.4.3, with hash b4cbecbc0781 from 2015-02-25 12:15:33+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.36% 1.91% 9.25% 14.15% :-| pybench 0.27% -0.12% 0.61% 5.68% :-( regex_v8 2.64% -0.48% -4.45% 4.50% :-) nbody 0.08% 2.95% 2.78% 5.76% :-( json_dump_v2 0.18% -1.54% -2.07% 10.12% :-| normal_startup 0.89% 0.16% 0.39% 5.35% ---------------------------------------------------------------------------------- * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/ugly-benchmark-results-for-python-def… Note: Benchmark results are measured in seconds. Subject Label Legend: Attributes are determined based on the performance evolution of the workloads compared to the previous measurement iteration. NEUTRAL: performance did not change by more than 1% for any workload GOOD: performance improved by more than 1% for at least one workload and there is no regression greater than 1% BAD: performance dropped by more than 1% for at least one workload and there is no improvement greater than 1% UGLY: performance improved by more than 1% for at least one workload and also dropped by more than 1% for at least one workload Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

cpython (2.7): Issue #22854: fileno() is always required in IOBase; remove test
by martin.panter March 31, 2016

March 31, 2016

https://hg.python.org/cpython/rev/3d9d9ca75a31 changeset: 100809:3d9d9ca75a31 branch: 2.7 parent: 100805:249ef9d02aa6 user: Martin Panter <vadmium+py(a)gmail.com> date: Thu Mar 31 07:21:56 2016 +0000 summary: Issue #22854: fileno() is always required in IOBase; remove test Also change BufferedReader.writable() and BufferedWriter.readable() to always return False. files: Lib/test/test_io.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -693,12 +693,6 @@ self.assertEqual(42, bufio.fileno()) - @unittest.skip('test having existential crisis') - def test_no_fileno(self): - # XXX will we always have fileno() function? If so, kill - # this test. Else, write it. - pass - def test_invalid_args(self): rawio = self.MockRawIO() bufio = self.tp(rawio) -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (b6eebe7cf5ae): sum=4
by solipsis＠pitrou.net March 31, 2016

March 31, 2016

results for b6eebe7cf5ae on branch "default" -------------------------------------------- test_functools leaked [0, 2, 2] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/refloguEN2nc', '--timeout', '7200']

1 0

cpython (merge 3.5 -> default): Issue #22854: Merge UnsupportedOperation fixes from 3.5
by martin.panter March 31, 2016

March 31, 2016

https://hg.python.org/cpython/rev/c27e9dcad1a3 changeset: 100808:c27e9dcad1a3 parent: 100806:b6eebe7cf5ae parent: 100807:dc9e5f09ac0c user: Martin Panter <vadmium+py(a)gmail.com> date: Thu Mar 31 08:25:59 2016 +0000 summary: Issue #22854: Merge UnsupportedOperation fixes from 3.5 files: Lib/_pyio.py | 18 +- Lib/test/test_io.py | 116 +++++++++++++++++++-- Misc/NEWS | 3 + Modules/_io/bufferedio.c | 2 - Modules/_io/clinic/iobase.c.h | 10 +- Modules/_io/iobase.c | 16 +- 6 files changed, 130 insertions(+), 35 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -390,7 +390,7 @@ def seekable(self): """Return a bool indicating whether object supports random access. - If False, seek(), tell() and truncate() will raise UnsupportedOperation. + If False, seek(), tell() and truncate() will raise OSError. This method may need to do a test seek(). """ return False @@ -405,7 +405,7 @@ def readable(self): """Return a bool indicating whether object was opened for reading. - If False, read() will raise UnsupportedOperation. + If False, read() will raise OSError. """ return False @@ -419,7 +419,7 @@ def writable(self): """Return a bool indicating whether object was opened for writing. - If False, write() and truncate() will raise UnsupportedOperation. + If False, write() and truncate() will raise OSError. """ return False @@ -787,12 +787,6 @@ def seekable(self): return self.raw.seekable() - def readable(self): - return self.raw.readable() - - def writable(self): - return self.raw.writable() - @property def raw(self): return self._raw @@ -982,6 +976,9 @@ self._reset_read_buf() self._read_lock = Lock() + def readable(self): + return self.raw.readable() + def _reset_read_buf(self): self._read_buf = b"" self._read_pos = 0 @@ -1170,6 +1167,9 @@ self._write_buf = bytearray() self._write_lock = Lock() + def writable(self): + return self.raw.writable() + def write(self, b): if self.closed: raise ValueError("write to closed file") diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -203,6 +203,9 @@ def tell(self, *args): raise self.UnsupportedOperation("not seekable") + def truncate(self, *args): + raise self.UnsupportedOperation("not seekable") + class CMockUnseekableIO(MockUnseekableIO, io.BytesIO): UnsupportedOperation = io.UnsupportedOperation @@ -361,6 +364,107 @@ self.assertRaises(exc, fp.seek, 1, self.SEEK_CUR) self.assertRaises(exc, fp.seek, -1, self.SEEK_END) + def test_optional_abilities(self): + # Test for OSError when optional APIs are not supported + # The purpose of this test is to try fileno(), reading, writing and + # seeking operations with various objects that indicate they do not + # support these operations. + + def pipe_reader(): + [r, w] = os.pipe() + os.close(w) # So that read() is harmless + return self.FileIO(r, "r") + + def pipe_writer(): + [r, w] = os.pipe() + self.addCleanup(os.close, r) + # Guarantee that we can write into the pipe without blocking + thread = threading.Thread(target=os.read, args=(r, 100)) + thread.start() + self.addCleanup(thread.join) + return self.FileIO(w, "w") + + def buffered_reader(): + return self.BufferedReader(self.MockUnseekableIO()) + + def buffered_writer(): + return self.BufferedWriter(self.MockUnseekableIO()) + + def buffered_random(): + return self.BufferedRandom(self.BytesIO()) + + def buffered_rw_pair(): + return self.BufferedRWPair(self.MockUnseekableIO(), + self.MockUnseekableIO()) + + def text_reader(): + class UnseekableReader(self.MockUnseekableIO): + writable = self.BufferedIOBase.writable + write = self.BufferedIOBase.write + return self.TextIOWrapper(UnseekableReader(), "ascii") + + def text_writer(): + class UnseekableWriter(self.MockUnseekableIO): + readable = self.BufferedIOBase.readable + read = self.BufferedIOBase.read + return self.TextIOWrapper(UnseekableWriter(), "ascii") + + tests = ( + (pipe_reader, "fr"), (pipe_writer, "fw"), + (buffered_reader, "r"), (buffered_writer, "w"), + (buffered_random, "rws"), (buffered_rw_pair, "rw"), + (text_reader, "r"), (text_writer, "w"), + (self.BytesIO, "rws"), (self.StringIO, "rws"), + ) + for [test, abilities] in tests: + if test is pipe_writer and not threading: + continue # Skip subtest that uses a background thread + with self.subTest(test), test() as obj: + readable = "r" in abilities + self.assertEqual(obj.readable(), readable) + writable = "w" in abilities + self.assertEqual(obj.writable(), writable) + seekable = "s" in abilities + self.assertEqual(obj.seekable(), seekable) + + if isinstance(obj, self.TextIOBase): + data = "3" + elif isinstance(obj, (self.BufferedIOBase, self.RawIOBase)): + data = b"3" + else: + self.fail("Unknown base class") + + if "f" in abilities: + obj.fileno() + else: + self.assertRaises(OSError, obj.fileno) + + if readable: + obj.read(1) + obj.read() + else: + self.assertRaises(OSError, obj.read, 1) + self.assertRaises(OSError, obj.read) + + if writable: + obj.write(data) + else: + self.assertRaises(OSError, obj.write, data) + + if seekable: + obj.tell() + obj.seek(0) + else: + self.assertRaises(OSError, obj.tell) + self.assertRaises(OSError, obj.seek, 0) + + if writable and seekable: + obj.truncate() + obj.truncate(0) + else: + self.assertRaises(OSError, obj.truncate) + self.assertRaises(OSError, obj.truncate, 0) + def test_open_handles_NUL_chars(self): fn_with_NUL = 'foo\0bar' self.assertRaises(ValueError, self.open, fn_with_NUL, 'w') @@ -751,12 +855,6 @@ self.assertEqual(42, bufio.fileno()) - @unittest.skip('test having existential crisis') - def test_no_fileno(self): - # XXX will we always have fileno() function? If so, kill - # this test. Else, write it. - pass - def test_invalid_args(self): rawio = self.MockRawIO() bufio = self.tp(rawio) @@ -784,13 +882,9 @@ super().flush() rawio = self.MockRawIO() bufio = MyBufferedIO(rawio) - writable = bufio.writable() del bufio support.gc_collect() - if writable: - self.assertEqual(record, [1, 2, 3]) - else: - self.assertEqual(record, [1, 2]) + self.assertEqual(record, [1, 2, 3]) def test_context_manager(self): # Test usability as a context manager diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -237,6 +237,9 @@ Library ------- +- Issue #22854: Change BufferedReader.writable() and + BufferedWriter.readable() to always return False. + - Issue #26492: Exhausted iterator of array.array now conforms with the behavior of iterators of other mutable sequences: it lefts exhausted even if iterated array is extended. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2398,7 +2398,6 @@ {"close", (PyCFunction)buffered_close, METH_NOARGS}, {"seekable", (PyCFunction)buffered_seekable, METH_NOARGS}, {"readable", (PyCFunction)buffered_readable, METH_NOARGS}, - {"writable", (PyCFunction)buffered_writable, METH_NOARGS}, {"fileno", (PyCFunction)buffered_fileno, METH_NOARGS}, {"isatty", (PyCFunction)buffered_isatty, METH_NOARGS}, {"_dealloc_warn", (PyCFunction)buffered_dealloc_warn, METH_O}, @@ -2489,7 +2488,6 @@ {"close", (PyCFunction)buffered_close, METH_NOARGS}, {"detach", (PyCFunction)buffered_detach, METH_NOARGS}, {"seekable", (PyCFunction)buffered_seekable, METH_NOARGS}, - {"readable", (PyCFunction)buffered_readable, METH_NOARGS}, {"writable", (PyCFunction)buffered_writable, METH_NOARGS}, {"fileno", (PyCFunction)buffered_fileno, METH_NOARGS}, {"isatty", (PyCFunction)buffered_isatty, METH_NOARGS}, diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h --- a/Modules/_io/clinic/iobase.c.h +++ b/Modules/_io/clinic/iobase.c.h @@ -66,7 +66,7 @@ "\n" "Return whether object supports random access.\n" "\n" -"If False, seek(), tell() and truncate() will raise UnsupportedOperation.\n" +"If False, seek(), tell() and truncate() will raise OSError.\n" "This method may need to do a test seek()."); #define _IO__IOBASE_SEEKABLE_METHODDEF \ @@ -87,7 +87,7 @@ "\n" "Return whether object was opened for reading.\n" "\n" -"If False, read() will raise UnsupportedOperation."); +"If False, read() will raise OSError."); #define _IO__IOBASE_READABLE_METHODDEF \ {"readable", (PyCFunction)_io__IOBase_readable, METH_NOARGS, _io__IOBase_readable__doc__}, @@ -107,7 +107,7 @@ "\n" "Return whether object was opened for writing.\n" "\n" -"If False, write() will raise UnsupportedOperation."); +"If False, write() will raise OSError."); #define _IO__IOBASE_WRITABLE_METHODDEF \ {"writable", (PyCFunction)_io__IOBase_writable, METH_NOARGS, _io__IOBase_writable__doc__}, @@ -127,7 +127,7 @@ "\n" "Returns underlying file descriptor if one exists.\n" "\n" -"An IOError is raised if the IO object does not use a file descriptor."); +"OSError is raised if the IO object does not use a file descriptor."); #define _IO__IOBASE_FILENO_METHODDEF \ {"fileno", (PyCFunction)_io__IOBase_fileno, METH_NOARGS, _io__IOBase_fileno__doc__}, @@ -276,4 +276,4 @@ { return _io__RawIOBase_readall_impl(self); } -/*[clinic end generated code: output=fe034152b6884e65 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b874952f5cc248a4 input=a9049054013a1b77]*/ diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -335,13 +335,13 @@ Return whether object supports random access. -If False, seek(), tell() and truncate() will raise UnsupportedOperation. +If False, seek(), tell() and truncate() will raise OSError. This method may need to do a test seek(). [clinic start generated code]*/ static PyObject * _io__IOBase_seekable_impl(PyObject *self) -/*[clinic end generated code: output=4c24c67f5f32a43d input=22676eebb81dcf1e]*/ +/*[clinic end generated code: output=4c24c67f5f32a43d input=b976622f7fdf3063]*/ { Py_RETURN_FALSE; } @@ -368,12 +368,12 @@ Return whether object was opened for reading. -If False, read() will raise UnsupportedOperation. +If False, read() will raise OSError. [clinic start generated code]*/ static PyObject * _io__IOBase_readable_impl(PyObject *self) -/*[clinic end generated code: output=e48089250686388b input=12fc3d8f6be46434]*/ +/*[clinic end generated code: output=e48089250686388b input=285b3b866a0ec35f]*/ { Py_RETURN_FALSE; } @@ -401,12 +401,12 @@ Return whether object was opened for writing. -If False, write() will raise UnsupportedOperation. +If False, write() will raise OSError. [clinic start generated code]*/ static PyObject * _io__IOBase_writable_impl(PyObject *self) -/*[clinic end generated code: output=406001d0985be14f input=c17a0bb6a8dfc590]*/ +/*[clinic end generated code: output=406001d0985be14f input=9dcac18a013a05b5]*/ { Py_RETURN_FALSE; } @@ -456,12 +456,12 @@ Returns underlying file descriptor if one exists. -An IOError is raised if the IO object does not use a file descriptor. +OSError is raised if the IO object does not use a file descriptor. [clinic start generated code]*/ static PyObject * _io__IOBase_fileno_impl(PyObject *self) -/*[clinic end generated code: output=7cc0973f0f5f3b73 input=32773c5df4b7eede]*/ +/*[clinic end generated code: output=7cc0973f0f5f3b73 input=4e37028947dc1cc8]*/ { return iobase_unsupported("fileno"); } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #22854: Clarify documentation about UnsupportedOperation and add tests
by martin.panter March 31, 2016

March 31, 2016

https://hg.python.org/cpython/rev/dc9e5f09ac0c changeset: 100807:dc9e5f09ac0c branch: 3.5 parent: 100803:89ba67ee83d6 user: Martin Panter <vadmium+py(a)gmail.com> date: Thu Mar 31 07:21:56 2016 +0000 summary: Issue #22854: Clarify documentation about UnsupportedOperation and add tests Also change BufferedReader.writable() and BufferedWriter.readable() to always return False. files: Lib/_pyio.py | 18 +- Lib/test/test_io.py | 116 +++++++++++++++++++-- Misc/NEWS | 3 + Modules/_io/bufferedio.c | 2 - Modules/_io/clinic/iobase.c.h | 10 +- Modules/_io/iobase.c | 16 +- 6 files changed, 130 insertions(+), 35 deletions(-) diff --git a/Lib/_pyio.py b/Lib/_pyio.py --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -390,7 +390,7 @@ def seekable(self): """Return a bool indicating whether object supports random access. - If False, seek(), tell() and truncate() will raise UnsupportedOperation. + If False, seek(), tell() and truncate() will raise OSError. This method may need to do a test seek(). """ return False @@ -405,7 +405,7 @@ def readable(self): """Return a bool indicating whether object was opened for reading. - If False, read() will raise UnsupportedOperation. + If False, read() will raise OSError. """ return False @@ -419,7 +419,7 @@ def writable(self): """Return a bool indicating whether object was opened for writing. - If False, write() and truncate() will raise UnsupportedOperation. + If False, write() and truncate() will raise OSError. """ return False @@ -787,12 +787,6 @@ def seekable(self): return self.raw.seekable() - def readable(self): - return self.raw.readable() - - def writable(self): - return self.raw.writable() - @property def raw(self): return self._raw @@ -982,6 +976,9 @@ self._reset_read_buf() self._read_lock = Lock() + def readable(self): + return self.raw.readable() + def _reset_read_buf(self): self._read_buf = b"" self._read_pos = 0 @@ -1170,6 +1167,9 @@ self._write_buf = bytearray() self._write_lock = Lock() + def writable(self): + return self.raw.writable() + def write(self, b): if self.closed: raise ValueError("write to closed file") diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -203,6 +203,9 @@ def tell(self, *args): raise self.UnsupportedOperation("not seekable") + def truncate(self, *args): + raise self.UnsupportedOperation("not seekable") + class CMockUnseekableIO(MockUnseekableIO, io.BytesIO): UnsupportedOperation = io.UnsupportedOperation @@ -361,6 +364,107 @@ self.assertRaises(exc, fp.seek, 1, self.SEEK_CUR) self.assertRaises(exc, fp.seek, -1, self.SEEK_END) + def test_optional_abilities(self): + # Test for OSError when optional APIs are not supported + # The purpose of this test is to try fileno(), reading, writing and + # seeking operations with various objects that indicate they do not + # support these operations. + + def pipe_reader(): + [r, w] = os.pipe() + os.close(w) # So that read() is harmless + return self.FileIO(r, "r") + + def pipe_writer(): + [r, w] = os.pipe() + self.addCleanup(os.close, r) + # Guarantee that we can write into the pipe without blocking + thread = threading.Thread(target=os.read, args=(r, 100)) + thread.start() + self.addCleanup(thread.join) + return self.FileIO(w, "w") + + def buffered_reader(): + return self.BufferedReader(self.MockUnseekableIO()) + + def buffered_writer(): + return self.BufferedWriter(self.MockUnseekableIO()) + + def buffered_random(): + return self.BufferedRandom(self.BytesIO()) + + def buffered_rw_pair(): + return self.BufferedRWPair(self.MockUnseekableIO(), + self.MockUnseekableIO()) + + def text_reader(): + class UnseekableReader(self.MockUnseekableIO): + writable = self.BufferedIOBase.writable + write = self.BufferedIOBase.write + return self.TextIOWrapper(UnseekableReader(), "ascii") + + def text_writer(): + class UnseekableWriter(self.MockUnseekableIO): + readable = self.BufferedIOBase.readable + read = self.BufferedIOBase.read + return self.TextIOWrapper(UnseekableWriter(), "ascii") + + tests = ( + (pipe_reader, "fr"), (pipe_writer, "fw"), + (buffered_reader, "r"), (buffered_writer, "w"), + (buffered_random, "rws"), (buffered_rw_pair, "rw"), + (text_reader, "r"), (text_writer, "w"), + (self.BytesIO, "rws"), (self.StringIO, "rws"), + ) + for [test, abilities] in tests: + if test is pipe_writer and not threading: + continue # Skip subtest that uses a background thread + with self.subTest(test), test() as obj: + readable = "r" in abilities + self.assertEqual(obj.readable(), readable) + writable = "w" in abilities + self.assertEqual(obj.writable(), writable) + seekable = "s" in abilities + self.assertEqual(obj.seekable(), seekable) + + if isinstance(obj, self.TextIOBase): + data = "3" + elif isinstance(obj, (self.BufferedIOBase, self.RawIOBase)): + data = b"3" + else: + self.fail("Unknown base class") + + if "f" in abilities: + obj.fileno() + else: + self.assertRaises(OSError, obj.fileno) + + if readable: + obj.read(1) + obj.read() + else: + self.assertRaises(OSError, obj.read, 1) + self.assertRaises(OSError, obj.read) + + if writable: + obj.write(data) + else: + self.assertRaises(OSError, obj.write, data) + + if seekable: + obj.tell() + obj.seek(0) + else: + self.assertRaises(OSError, obj.tell) + self.assertRaises(OSError, obj.seek, 0) + + if writable and seekable: + obj.truncate() + obj.truncate(0) + else: + self.assertRaises(OSError, obj.truncate) + self.assertRaises(OSError, obj.truncate, 0) + def test_open_handles_NUL_chars(self): fn_with_NUL = 'foo\0bar' self.assertRaises(ValueError, self.open, fn_with_NUL, 'w') @@ -747,12 +851,6 @@ self.assertEqual(42, bufio.fileno()) - @unittest.skip('test having existential crisis') - def test_no_fileno(self): - # XXX will we always have fileno() function? If so, kill - # this test. Else, write it. - pass - def test_invalid_args(self): rawio = self.MockRawIO() bufio = self.tp(rawio) @@ -780,13 +878,9 @@ super().flush() rawio = self.MockRawIO() bufio = MyBufferedIO(rawio) - writable = bufio.writable() del bufio support.gc_collect() - if writable: - self.assertEqual(record, [1, 2, 3]) - else: - self.assertEqual(record, [1, 2]) + self.assertEqual(record, [1, 2, 3]) def test_context_manager(self): # Test usability as a context manager diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -99,6 +99,9 @@ Library ------- +- Issue #22854: Change BufferedReader.writable() and + BufferedWriter.readable() to always return False. + - Issue #25195: Fix a regression in mock.MagicMock. _Call is a subclass of tuple (changeset 3603bae63c13 only works for classes) so we need to implement __ne__ ourselves. Patch by Andrew Plummer. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -2398,7 +2398,6 @@ {"close", (PyCFunction)buffered_close, METH_NOARGS}, {"seekable", (PyCFunction)buffered_seekable, METH_NOARGS}, {"readable", (PyCFunction)buffered_readable, METH_NOARGS}, - {"writable", (PyCFunction)buffered_writable, METH_NOARGS}, {"fileno", (PyCFunction)buffered_fileno, METH_NOARGS}, {"isatty", (PyCFunction)buffered_isatty, METH_NOARGS}, {"_dealloc_warn", (PyCFunction)buffered_dealloc_warn, METH_O}, @@ -2489,7 +2488,6 @@ {"close", (PyCFunction)buffered_close, METH_NOARGS}, {"detach", (PyCFunction)buffered_detach, METH_NOARGS}, {"seekable", (PyCFunction)buffered_seekable, METH_NOARGS}, - {"readable", (PyCFunction)buffered_readable, METH_NOARGS}, {"writable", (PyCFunction)buffered_writable, METH_NOARGS}, {"fileno", (PyCFunction)buffered_fileno, METH_NOARGS}, {"isatty", (PyCFunction)buffered_isatty, METH_NOARGS}, diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h --- a/Modules/_io/clinic/iobase.c.h +++ b/Modules/_io/clinic/iobase.c.h @@ -66,7 +66,7 @@ "\n" "Return whether object supports random access.\n" "\n" -"If False, seek(), tell() and truncate() will raise UnsupportedOperation.\n" +"If False, seek(), tell() and truncate() will raise OSError.\n" "This method may need to do a test seek()."); #define _IO__IOBASE_SEEKABLE_METHODDEF \ @@ -87,7 +87,7 @@ "\n" "Return whether object was opened for reading.\n" "\n" -"If False, read() will raise UnsupportedOperation."); +"If False, read() will raise OSError."); #define _IO__IOBASE_READABLE_METHODDEF \ {"readable", (PyCFunction)_io__IOBase_readable, METH_NOARGS, _io__IOBase_readable__doc__}, @@ -107,7 +107,7 @@ "\n" "Return whether object was opened for writing.\n" "\n" -"If False, write() will raise UnsupportedOperation."); +"If False, write() will raise OSError."); #define _IO__IOBASE_WRITABLE_METHODDEF \ {"writable", (PyCFunction)_io__IOBase_writable, METH_NOARGS, _io__IOBase_writable__doc__}, @@ -127,7 +127,7 @@ "\n" "Returns underlying file descriptor if one exists.\n" "\n" -"An IOError is raised if the IO object does not use a file descriptor."); +"OSError is raised if the IO object does not use a file descriptor."); #define _IO__IOBASE_FILENO_METHODDEF \ {"fileno", (PyCFunction)_io__IOBase_fileno, METH_NOARGS, _io__IOBase_fileno__doc__}, @@ -276,4 +276,4 @@ { return _io__RawIOBase_readall_impl(self); } -/*[clinic end generated code: output=fe034152b6884e65 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b874952f5cc248a4 input=a9049054013a1b77]*/ diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -335,13 +335,13 @@ Return whether object supports random access. -If False, seek(), tell() and truncate() will raise UnsupportedOperation. +If False, seek(), tell() and truncate() will raise OSError. This method may need to do a test seek(). [clinic start generated code]*/ static PyObject * _io__IOBase_seekable_impl(PyObject *self) -/*[clinic end generated code: output=4c24c67f5f32a43d input=22676eebb81dcf1e]*/ +/*[clinic end generated code: output=4c24c67f5f32a43d input=b976622f7fdf3063]*/ { Py_RETURN_FALSE; } @@ -368,12 +368,12 @@ Return whether object was opened for reading. -If False, read() will raise UnsupportedOperation. +If False, read() will raise OSError. [clinic start generated code]*/ static PyObject * _io__IOBase_readable_impl(PyObject *self) -/*[clinic end generated code: output=e48089250686388b input=12fc3d8f6be46434]*/ +/*[clinic end generated code: output=e48089250686388b input=285b3b866a0ec35f]*/ { Py_RETURN_FALSE; } @@ -401,12 +401,12 @@ Return whether object was opened for writing. -If False, write() will raise UnsupportedOperation. +If False, write() will raise OSError. [clinic start generated code]*/ static PyObject * _io__IOBase_writable_impl(PyObject *self) -/*[clinic end generated code: output=406001d0985be14f input=c17a0bb6a8dfc590]*/ +/*[clinic end generated code: output=406001d0985be14f input=9dcac18a013a05b5]*/ { Py_RETURN_FALSE; } @@ -456,12 +456,12 @@ Returns underlying file descriptor if one exists. -An IOError is raised if the IO object does not use a file descriptor. +OSError is raised if the IO object does not use a file descriptor. [clinic start generated code]*/ static PyObject * _io__IOBase_fileno_impl(PyObject *self) -/*[clinic end generated code: output=7cc0973f0f5f3b73 input=32773c5df4b7eede]*/ +/*[clinic end generated code: output=7cc0973f0f5f3b73 input=4e37028947dc1cc8]*/ { return iobase_unsupported("fileno"); } -- Repository URL: https://hg.python.org/cpython

1 0

peps: Update status of work for PEP 512
by brett.cannon March 31, 2016

March 31, 2016

https://hg.python.org/peps/rev/db50442fe8fd changeset: 6272:db50442fe8fd user: Brett Cannon <brett(a)python.org> date: Wed Mar 30 19:59:57 2016 -0700 summary: Update status of work for PEP 512 files: pep-0512.txt | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pep-0512.txt b/pep-0512.txt --- a/pep-0512.txt +++ b/pep-0512.txt @@ -529,18 +529,20 @@ * In progress - - `A bot to enforce CLA signing`_: - https://github.com/brettcannon/knights-who-say-ni (Brett Cannon) - - `Define commands to move a Mercurial repository to Git`_: - https://github.com/orsenthil/cpython-hg-to-git (Senthil Kumaran) - - `Adding GitHub username support to bugs.python.org`_: - http://psf.upfronthosting.co.za/roundup/meta/issue579, - http://psf.upfronthosting.co.za/roundup/meta/issue581 - (Maciej Szulik and Ezio Melotti) + - `A bot to enforce CLA signing`_: + https://github.com/python/the-knights-who-say-ni (Brett Cannon) + - `Define commands to move a Mercurial repository to Git`_: + https://github.com/orsenthil/cpython-hg-to-git (Senthil Kumaran) + - `Adding GitHub username support to bugs.python.org`_ (HTTP API): + http://psf.upfronthosting.co.za/roundup/meta/issue581 + (Maciej Szulik and Ezio Melotti) * Completed - - None + - `Adding GitHub username support to bugs.python.org`_: + GitHub usernames on bugs.python.org + (Maciej Szulik and Ezio Melotti) + Repositories whose build steps need updating: -- Repository URL: https://hg.python.org/peps

1 0

cpython: Issue #26492: Exhausted iterator of array.array now conforms with the behavior
by serhiy.storchaka March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/b6eebe7cf5ae changeset: 100806:b6eebe7cf5ae parent: 100804:b4ea00d50e7e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Mar 30 21:11:16 2016 +0300 summary: Issue #26492: Exhausted iterator of array.array now conforms with the behavior of iterators of other mutable sequences: it lefts exhausted even if iterated array is extended. files: Lib/test/test_array.py | 21 +++++++++++++++++++-- Misc/NEWS | 4 ++++ Modules/arraymodule.c | 22 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -318,8 +318,19 @@ d = pickle.dumps((itorig, orig), proto) it, a = pickle.loads(d) a.fromlist(data2) - self.assertEqual(type(it), type(itorig)) - self.assertEqual(list(it), data2) + self.assertEqual(list(it), []) + + def test_exhausted_iterator(self): + a = array.array(self.typecode, self.example) + self.assertEqual(list(a), list(self.example)) + exhit = iter(a) + empit = iter(a) + for x in exhit: # exhaust the iterator + next(empit) # not exhausted + a.append(self.outside) + self.assertEqual(list(exhit), []) + self.assertEqual(list(empit), [self.outside]) + self.assertEqual(list(a), list(self.example) + [self.outside]) def test_insert(self): a = array.array(self.typecode, self.example) @@ -1070,6 +1081,12 @@ a = array.array('B', b"") self.assertRaises(BufferError, getbuffer_with_null_view, a) + def test_free_after_iterating(self): + support.check_free_after_iterating(self, iter, array.array, + (self.typecode,)) + support.check_free_after_iterating(self, reversed, array.array, + (self.typecode,)) + class StringTest(BaseTest): def test_setitem(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -237,6 +237,10 @@ Library ------- +- Issue #26492: Exhausted iterator of array.array now conforms with the behavior + of iterators of other mutable sequences: it lefts exhausted even if iterated + array is extended. + - Issue #26641: doctest.DocFileTest and doctest.testfile() now support packages (module splitted into multiple directories) for the package parameter. diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -2875,9 +2875,20 @@ static PyObject * arrayiter_next(arrayiterobject *it) { + arrayobject *ao; + + assert(it != NULL); assert(PyArrayIter_Check(it)); - if (it->index < Py_SIZE(it->ao)) - return (*it->getitem)(it->ao, it->index++); + ao = it->ao; + if (ao == NULL) { + return NULL; + } + assert(array_Check(ao)); + if (it->index < Py_SIZE(ao)) { + return (*it->getitem)(ao, it->index++); + } + it->ao = NULL; + Py_DECREF(ao); return NULL; } @@ -2906,8 +2917,11 @@ array_arrayiterator___reduce___impl(arrayiterobject *self) /*[clinic end generated code: output=7898a52e8e66e016 input=a062ea1e9951417a]*/ { - return Py_BuildValue("N(O)n", _PyObject_GetBuiltin("iter"), - self->ao, self->index); + PyObject *func = _PyObject_GetBuiltin("iter"); + if (self->ao == NULL) { + return Py_BuildValue("N(())", func); + } + return Py_BuildValue("N(O)n", func, self->ao, self->index); } /*[clinic input] -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #26492: Added additional tests for exhausted iterators of mutable
by serhiy.storchaka March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/b4ea00d50e7e changeset: 100804:b4ea00d50e7e parent: 100801:73ce47d4a7b2 parent: 100803:89ba67ee83d6 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Mar 30 21:01:45 2016 +0300 summary: Issue #26492: Added additional tests for exhausted iterators of mutable sequences. files: Lib/test/list_tests.py | 11 +++++++++++ Lib/test/test_bytes.py | 2 ++ Lib/test/test_iter.py | 11 +++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py --- a/Lib/test/list_tests.py +++ b/Lib/test/list_tests.py @@ -593,3 +593,14 @@ def __iter__(self): raise KeyboardInterrupt self.assertRaises(KeyboardInterrupt, list, F()) + + def test_exhausted_iterator(self): + a = self.type2test([1, 2, 3]) + exhit = iter(a) + empit = iter(a) + for x in exhit: # exhaust the iterator + next(empit) # not exhausted + a.append(9) + self.assertEqual(list(exhit), []) + self.assertEqual(list(empit), [9]) + self.assertEqual(a, self.type2test([1, 2, 3, 9])) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -17,6 +17,7 @@ import test.support import test.string_tests import test.buffer_tests +import test.list_tests from test.support import bigaddrspacetest, MAX_Py_ssize_t @@ -1418,6 +1419,7 @@ b[:] = data self.assertEqual(list(it), []) + test_exhausted_iterator = test.list_tests.CommonTest.test_exhausted_iterator class AssortedBytesTest(unittest.TestCase): # diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py --- a/Lib/test/test_iter.py +++ b/Lib/test/test_iter.py @@ -190,6 +190,17 @@ self.assertTrue(isinstance(it, collections.abc.Iterator)) self.assertEqual(list(it), []) + def test_mutating_seq_class_exhausted_iter(self): + a = SequenceClass(5) + exhit = iter(a) + empit = iter(a) + for x in exhit: # exhaust the iterator + next(empit) # not exhausted + a.n = 7 + self.assertEqual(list(exhit), []) + self.assertEqual(list(empit), [5, 6]) + self.assertEqual(list(a), [0, 1, 2, 3, 4, 5, 6]) + # Test a new_style class with __iter__ but no next() method def test_new_style_iter_class(self): class IterClass(object): -- Repository URL: https://hg.python.org/cpython

1 0