Mailman 3 June 2018 - Python-checkins

bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/eabebbb54c2604fd8d08e8019ea1be634a… commit: eabebbb54c2604fd8d08e8019ea1be634aed8c2f branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T03:34:34-07:00 summary: bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918) (cherry picked from commit 23db935bcf258657682e66464bf8512def8af830) Co-authored-by: Zackery Spytz <zspytz(… [View More]a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst M Lib/_pyio.py M Lib/test/test_io.py M Modules/_io/textio.c diff --git a/Lib/_pyio.py b/Lib/_pyio.py index c91a647a2f67..f0d4f4ed27a2 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -2149,6 +2149,7 @@ def write(self, s): self.buffer.write(b) if self._line_buffering and (haslf or "\r" in s): self.flush() + self._set_decoded_chars('') self._snapshot = None if self._decoder: self._decoder.reset() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 286ae760e17f..a03a7f78109c 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3549,6 +3549,17 @@ def test_reconfigure_newline(self): expected = 'linesep' + os.linesep + 'LF\nLF\nCR\rCRLF\r\n' self.assertEqual(txt.detach().getvalue().decode('ascii'), expected) + def test_issue25862(self): + # Assertion failures occurred in tell() after read() and write(). + t = self.TextIOWrapper(self.BytesIO(b'test'), encoding='ascii') + t.read(1) + t.read() + t.tell() + t = self.TextIOWrapper(self.BytesIO(b'test'), encoding='ascii') + t.read(1) + t.write('x') + t.tell() + class MemviewBytesIO(io.BytesIO): '''A BytesIO object whose read method returns memoryviews diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst new file mode 100644 index 000000000000..787163643ad8 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst @@ -0,0 +1,2 @@ +Fix assertion failures in the ``tell()`` method of ``io.TextIOWrapper``. +Patch by Zackery Spytz. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 717b56ab319b..fa162e2c6fac 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -694,6 +694,9 @@ typedef struct PyObject *dict; } textio; +static void +textiowrapper_set_decoded_chars(textio *self, PyObject *chars); + /* A couple of specialized cases in order to bypass the slow incremental encoding methods for the most popular encodings. */ @@ -1606,6 +1609,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text) Py_DECREF(ret); } + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); if (self->decoder) { @@ -1835,6 +1839,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n) if (result == NULL) goto fail; + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); return result; } [View Less]

1 0

Fix the indentation in the documentation of bin() and hash() (GH-7998)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/a73027918a659ca69480a7e023d3838e26… commit: a73027918a659ca69480a7e023d3838e2601ce6d branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T03:17:43-07:00 summary: Fix the indentation in the documentation of bin() and hash() (GH-7998) (cherry picked from commit bda9c3eae3ad16e43145599ac6359bfdcaf1fd4a) Co-authored-by: Andrés Delfino <… [View More]

1 0

Fix the indentation in the documentation of bin() and hash() (GH-7998)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/d0b442803ad4ba66b0bdb3cf183179d4c9… commit: d0b442803ad4ba66b0bdb3cf183179d4c9a56f06 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T03:16:26-07:00 summary: Fix the indentation in the documentation of bin() and hash() (GH-7998) (cherry picked from commit bda9c3eae3ad16e43145599ac6359bfdcaf1fd4a) Co-authored-by: Andrés Delfino <… [View More]

1 0

bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918)
by Serhiy Storchaka June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/23db935bcf258657682e66464bf8512def… commit: 23db935bcf258657682e66464bf8512def8af830 branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-06-29T13:14:58+03:00 summary: bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918) files: A Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst M Lib/_pyio.py M Lib/test/test_io.py M Modules/_io/… [View More]textio.c diff --git a/Lib/_pyio.py b/Lib/_pyio.py index c91a647a2f67..f0d4f4ed27a2 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -2149,6 +2149,7 @@ def write(self, s): self.buffer.write(b) if self._line_buffering and (haslf or "\r" in s): self.flush() + self._set_decoded_chars('') self._snapshot = None if self._decoder: self._decoder.reset() diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 286ae760e17f..a03a7f78109c 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3549,6 +3549,17 @@ def test_reconfigure_newline(self): expected = 'linesep' + os.linesep + 'LF\nLF\nCR\rCRLF\r\n' self.assertEqual(txt.detach().getvalue().decode('ascii'), expected) + def test_issue25862(self): + # Assertion failures occurred in tell() after read() and write(). + t = self.TextIOWrapper(self.BytesIO(b'test'), encoding='ascii') + t.read(1) + t.read() + t.tell() + t = self.TextIOWrapper(self.BytesIO(b'test'), encoding='ascii') + t.read(1) + t.write('x') + t.tell() + class MemviewBytesIO(io.BytesIO): '''A BytesIO object whose read method returns memoryviews diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst new file mode 100644 index 000000000000..787163643ad8 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-07-10-13-15.bpo-25862.FPYBA5.rst @@ -0,0 +1,2 @@ +Fix assertion failures in the ``tell()`` method of ``io.TextIOWrapper``. +Patch by Zackery Spytz. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 209aa13cbd17..6e706cdeb60a 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -694,6 +694,9 @@ typedef struct PyObject *dict; } textio; +static void +textiowrapper_set_decoded_chars(textio *self, PyObject *chars); + /* A couple of specialized cases in order to bypass the slow incremental encoding methods for the most popular encodings. */ @@ -1606,6 +1609,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text) Py_DECREF(ret); } + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); if (self->decoder) { @@ -1835,6 +1839,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n) if (result == NULL) goto fail; + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); return result; } [View Less]

1 0

Fix the indentation in the documentation of bin() and hash() (GH-7998)
by Serhiy Storchaka June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/bda9c3eae3ad16e43145599ac6359bfdca… commit: bda9c3eae3ad16e43145599ac6359bfdcaf1fd4a branch: master author: Andrés Delfino <adelfino(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-06-29T12:57:10+03:00 summary: Fix the indentation in the documentation of bin() and hash() (GH-7998) files: M Doc/library/functions.rst diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 7b1b0caa11ab..… [View More]

1 0

Daily reference leaks (4243df51fe43): sum=10
by solipsis＠pitrou.net June 29, 2018

June 29, 2018

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

1 0

bpo-14117: Make minor tweaks to turtledemo (GH-8002)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/00e05242ae650bc29e8052a5fb79cbb832… commit: 00e05242ae650bc29e8052a5fb79cbb83224a657 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-28T22:32:16-07:00 summary: bpo-14117: Make minor tweaks to turtledemo (GH-8002) The 'wikipedia' example is now 'rosette', describing what it draws. The 'penrose' print output is reduced. The 'tree' '1024' … [View More]

1 0

bpo-14117: Make minor tweaks to turtledemo (GH-8002)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/e2c5a753fa3eabe176c34048e3b68674f9… commit: e2c5a753fa3eabe176c34048e3b68674f99386b0 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-28T22:30:44-07:00 summary: bpo-14117: Make minor tweaks to turtledemo (GH-8002) The 'wikipedia' example is now 'rosette', describing what it draws. The 'penrose' print output is reduced. The 'tree' '1024' … [View More]

1 0

bpo-14117: Make minor tweaks to turtledemo (GH-8002)
by Terry Jan Reedy June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/891a1f86d415779cf67ca23e626a868e58… commit: 891a1f86d415779cf67ca23e626a868e586feb05 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-06-29T01:10:05-04:00 summary: bpo-14117: Make minor tweaks to turtledemo (GH-8002) The 'wikipedia' example is now 'rosette', describing what it draws. The 'penrose' print output is reduced. The 'tree' '1024' output is eliminated. files: A Lib/… [View More]

1 0

bpo-27500: Fix static version of getaddrinfo to resolve IPv6 (GH-7993)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/c00144cd7741a5060662e85717f6559ad4… commit: c00144cd7741a5060662e85717f6559ad46d02aa branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-28T19:22:39-07:00 summary: bpo-27500: Fix static version of getaddrinfo to resolve IPv6 (GH-7993) (cherry picked from commit d904c238ca3551750cb97d15d827c3e525970867) Co-authored-by: Yury Selivanov <yury(a)… [View More]magic.io> files: A Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst M Lib/asyncio/base_events.py M Lib/test/test_asyncio/test_base_events.py diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 083f45df2ffd..79f0d63c5726 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -54,6 +54,8 @@ _FATAL_ERROR_IGNORE = (BrokenPipeError, ConnectionResetError, ConnectionAbortedError) +_HAS_IPv6 = hasattr(socket, 'AF_INET6') + def _format_handle(handle): cb = handle._callback @@ -136,7 +138,7 @@ def _ipaddr_info(host, port, family, type, proto): if family == socket.AF_UNSPEC: afs = [socket.AF_INET] - if hasattr(socket, 'AF_INET6'): + if _HAS_IPv6: afs.append(socket.AF_INET6) else: afs = [family] @@ -152,7 +154,10 @@ def _ipaddr_info(host, port, family, type, proto): try: socket.inet_pton(af, host) # The host has already been resolved. - return af, type, proto, '', (host, port) + if _HAS_IPv6 and af == socket.AF_INET6: + return af, type, proto, '', (host, port, 0, 0) + else: + return af, type, proto, '', (host, port) except OSError: pass @@ -997,7 +1002,6 @@ def create_server(self, protocol_factory, host=None, port=None, raise ValueError( 'host/port and sock can not be specified at the same time') - AF_INET6 = getattr(socket, 'AF_INET6', 0) if reuse_address is None: reuse_address = os.name == 'posix' and sys.platform != 'cygwin' sockets = [] @@ -1037,7 +1041,9 @@ def create_server(self, protocol_factory, host=None, port=None, # Disable IPv4/IPv6 dual stack support (enabled by # default on Linux) which makes a single socket # listen on both address families. - if af == AF_INET6 and hasattr(socket, 'IPPROTO_IPV6'): + if (_HAS_IPv6 and + af == socket.AF_INET6 and + hasattr(socket, 'IPPROTO_IPV6')): sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, True) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 42c0707e8f21..dd61bf0fe59a 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -101,11 +101,11 @@ def test_ipaddr_info(self): base_events._ipaddr_info('1.2.3.4', 1, INET6, STREAM, TCP)) self.assertEqual( - (INET6, STREAM, TCP, '', ('::3', 1)), + (INET6, STREAM, TCP, '', ('::3', 1, 0, 0)), base_events._ipaddr_info('::3', 1, INET6, STREAM, TCP)) self.assertEqual( - (INET6, STREAM, TCP, '', ('::3', 1)), + (INET6, STREAM, TCP, '', ('::3', 1, 0, 0)), base_events._ipaddr_info('::3', 1, UNSPEC, STREAM, TCP)) # IPv6 address with family IPv4. @@ -1067,6 +1067,26 @@ def test_create_server_stream_bittype(self): srv.close() self.loop.run_until_complete(srv.wait_closed()) + @unittest.skipUnless(hasattr(socket, 'AF_INET6'), 'no IPv6 support') + def test_create_server_ipv6(self): + async def main(): + srv = await asyncio.start_server( + lambda: None, '::1', 0, loop=self.loop) + try: + self.assertGreater(len(srv.sockets), 0) + finally: + srv.close() + await srv.wait_closed() + + try: + self.loop.run_until_complete(main()) + except OSError as ex: + if (hasattr(errno, 'EADDRNOTAVAIL') and + ex.errno == errno.EADDRNOTAVAIL): + self.skipTest('failed to bind to ::1') + else: + raise + def test_create_datagram_endpoint_wrong_sock(self): sock = socket.socket(socket.AF_INET) with sock: diff --git a/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst b/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst new file mode 100644 index 000000000000..4762e2795643 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-28-13-00-12.bpo-27500._s1gZ5.rst @@ -0,0 +1 @@ +Fix getaddrinfo to resolve IPv6 addresses correctly. [View Less]

1 0