Mailman 3 June 2018 - Python-checkins

[2.7] bpo-33974: Fix passing special characters to ttk widgets. (GH-7986) (GH-8021)
by Serhiy Storchaka June 30, 2018

June 30, 2018

https://github.com/python/cpython/commit/9b84cc8771f52e9340ea5b676da9a15359… commit: 9b84cc8771f52e9340ea5b676da9a15359c723b6 branch: 2.7 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-06-30T13:34:56+03:00 summary: [2.7] bpo-33974: Fix passing special characters to ttk widgets. (GH-7986) (GH-8021) Fix passing lists and tuples of strings containing special characters '"', '\\', '{', '}' and '\n' as options to tkinter.ttk widgets. (cherry picked from commit 5bb5bbfca847524bab5f2368bdb48eedf5dba74f) files: A Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst M Lib/lib-tk/Tkinter.py M Lib/test/test_tcl.py diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index f46642f5bb99..2f3a3f12a512 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -71,7 +71,7 @@ def _stringify(value): if isinstance(value, (list, tuple)): if len(value) == 1: value = _stringify(value[0]) - if value[0] == '{': + if _magic_re.search(value): value = '{%s}' % value else: value = '{%s}' % _join(value) @@ -85,7 +85,10 @@ def _stringify(value): elif _magic_re.search(value): # add '\' before special characters and spaces value = _magic_re.sub(r'\\\1', value) + value = value.replace('\n', r'\n') value = _space_re.sub(r'\\\1', value) + if value[0] == '"': + value = '\\' + value elif value[0] == '"' or _space_re.search(value): value = '{%s}' % value return value diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index f0c9877862ec..84c4ceab003e 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -661,6 +661,43 @@ def test_splitdict(self): expected = {'a': (1, 2, 3), 'something': 'foo', 'status': ''} self.assertEqual(splitdict(tcl, arg), expected) + def test_join(self): + join = tkinter._join + tcl = self.interp.tk + def unpack(s): + return tcl.call('lindex', s, 0) + def check(value): + self.assertEqual(unpack(join([value])), value) + self.assertEqual(unpack(join([value, 0])), value) + self.assertEqual(unpack(unpack(join([[value]]))), value) + self.assertEqual(unpack(unpack(join([[value, 0]]))), value) + self.assertEqual(unpack(unpack(join([[value], 0]))), value) + self.assertEqual(unpack(unpack(join([[value, 0], 0]))), value) + check('') + check('spam') + check('sp am') + check('sp\tam') + check('sp\nam') + check(' \t\n') + check('{spam}') + check('{sp am}') + check('"spam"') + check('"sp am"') + check('{"spam"}') + check('"{spam}"') + check('sp\\am') + check('"sp\\am"') + check('"{}" "{}"') + check('"\\') + check('"{') + check('"}') + check('\n\\') + check('\n{') + check('\n}') + check('\\\n') + check('{\n') + check('}\n') + character_size = 4 if sys.maxunicode > 0xFFFF else 2 diff --git a/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst new file mode 100644 index 000000000000..8c03babd4f2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst @@ -0,0 +1,3 @@ +Fixed passing lists and tuples of strings containing special characters +``"``, ``\``, ``{``, ``}`` and ``\n`` as options to :mod:`~tkinter.ttk` +widgets.

1 0

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

June 30, 2018

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

1 0

bpo-33974: Fix passing special characters to ttk widgets. (GH-7986)
by Miss Islington (bot) June 30, 2018

June 30, 2018

https://github.com/python/cpython/commit/b2e88fcf63515f8a66759a6fdc75d08a0a… commit: b2e88fcf63515f8a66759a6fdc75d08a0a440901 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T23:43:22-07:00 summary: bpo-33974: Fix passing special characters to ttk widgets. (GH-7986) Fix passing lists and tuples of strings containing special characters '"', '\\', '{', '}' and '\n' as options to tkinter.ttk widgets. (cherry picked from commit 5bb5bbfca847524bab5f2368bdb48eedf5dba74f) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst M Lib/test/test_tcl.py M Lib/tkinter/__init__.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index db99b75eec64..80f1668bceca 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -649,6 +649,43 @@ def test_splitdict(self): expected = {'a': (1, 2, 3), 'something': 'foo', 'status': ''} self.assertEqual(splitdict(tcl, arg), expected) + def test_join(self): + join = tkinter._join + tcl = self.interp.tk + def unpack(s): + return tcl.call('lindex', s, 0) + def check(value): + self.assertEqual(unpack(join([value])), value) + self.assertEqual(unpack(join([value, 0])), value) + self.assertEqual(unpack(unpack(join([[value]]))), value) + self.assertEqual(unpack(unpack(join([[value, 0]]))), value) + self.assertEqual(unpack(unpack(join([[value], 0]))), value) + self.assertEqual(unpack(unpack(join([[value, 0], 0]))), value) + check('') + check('spam') + check('sp am') + check('sp\tam') + check('sp\nam') + check(' \t\n') + check('{spam}') + check('{sp am}') + check('"spam"') + check('"sp am"') + check('{"spam"}') + check('"{spam}"') + check('sp\\am') + check('"sp\\am"') + check('"{}" "{}"') + check('"\\') + check('"{') + check('"}') + check('\n\\') + check('\n{') + check('\n}') + check('\\\n') + check('{\n') + check('}\n') + def test_new_tcl_obj(self): self.assertRaises(TypeError, _tkinter.Tcl_Obj) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index b78191e2777f..ff85f837d1d5 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -61,7 +61,7 @@ def _stringify(value): if isinstance(value, (list, tuple)): if len(value) == 1: value = _stringify(value[0]) - if value[0] == '{': + if _magic_re.search(value): value = '{%s}' % value else: value = '{%s}' % _join(value) @@ -72,7 +72,10 @@ def _stringify(value): elif _magic_re.search(value): # add '\' before special characters and spaces value = _magic_re.sub(r'\\\1', value) + value = value.replace('\n', r'\n') value = _space_re.sub(r'\\\1', value) + if value[0] == '"': + value = '\\' + value elif value[0] == '"' or _space_re.search(value): value = '{%s}' % value return value diff --git a/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst new file mode 100644 index 000000000000..8c03babd4f2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst @@ -0,0 +1,3 @@ +Fixed passing lists and tuples of strings containing special characters +``"``, ``\``, ``{``, ``}`` and ``\n`` as options to :mod:`~tkinter.ttk` +widgets.

1 0

bpo-33974: Fix passing special characters to ttk widgets. (GH-7986)
by Miss Islington (bot) June 30, 2018

June 30, 2018

https://github.com/python/cpython/commit/42ea5226642c2a416b32278914fa473809… commit: 42ea5226642c2a416b32278914fa4738093298ff branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T23:42:57-07:00 summary: bpo-33974: Fix passing special characters to ttk widgets. (GH-7986) Fix passing lists and tuples of strings containing special characters '"', '\\', '{', '}' and '\n' as options to tkinter.ttk widgets. (cherry picked from commit 5bb5bbfca847524bab5f2368bdb48eedf5dba74f) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst M Lib/test/test_tcl.py M Lib/tkinter/__init__.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index db99b75eec64..80f1668bceca 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -649,6 +649,43 @@ def test_splitdict(self): expected = {'a': (1, 2, 3), 'something': 'foo', 'status': ''} self.assertEqual(splitdict(tcl, arg), expected) + def test_join(self): + join = tkinter._join + tcl = self.interp.tk + def unpack(s): + return tcl.call('lindex', s, 0) + def check(value): + self.assertEqual(unpack(join([value])), value) + self.assertEqual(unpack(join([value, 0])), value) + self.assertEqual(unpack(unpack(join([[value]]))), value) + self.assertEqual(unpack(unpack(join([[value, 0]]))), value) + self.assertEqual(unpack(unpack(join([[value], 0]))), value) + self.assertEqual(unpack(unpack(join([[value, 0], 0]))), value) + check('') + check('spam') + check('sp am') + check('sp\tam') + check('sp\nam') + check(' \t\n') + check('{spam}') + check('{sp am}') + check('"spam"') + check('"sp am"') + check('{"spam"}') + check('"{spam}"') + check('sp\\am') + check('"sp\\am"') + check('"{}" "{}"') + check('"\\') + check('"{') + check('"}') + check('\n\\') + check('\n{') + check('\n}') + check('\\\n') + check('{\n') + check('}\n') + def test_new_tcl_obj(self): self.assertRaises(TypeError, _tkinter.Tcl_Obj) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index b78191e2777f..ff85f837d1d5 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -61,7 +61,7 @@ def _stringify(value): if isinstance(value, (list, tuple)): if len(value) == 1: value = _stringify(value[0]) - if value[0] == '{': + if _magic_re.search(value): value = '{%s}' % value else: value = '{%s}' % _join(value) @@ -72,7 +72,10 @@ def _stringify(value): elif _magic_re.search(value): # add '\' before special characters and spaces value = _magic_re.sub(r'\\\1', value) + value = value.replace('\n', r'\n') value = _space_re.sub(r'\\\1', value) + if value[0] == '"': + value = '\\' + value elif value[0] == '"' or _space_re.search(value): value = '{%s}' % value return value diff --git a/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst new file mode 100644 index 000000000000..8c03babd4f2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst @@ -0,0 +1,3 @@ +Fixed passing lists and tuples of strings containing special characters +``"``, ``\``, ``{``, ``}`` and ``\n`` as options to :mod:`~tkinter.ttk` +widgets.

1 0

bpo-33974: Fix passing special characters to ttk widgets. (GH-7986)
by Serhiy Storchaka June 30, 2018

June 30, 2018

https://github.com/python/cpython/commit/5bb5bbfca847524bab5f2368bdb48eedf5… commit: 5bb5bbfca847524bab5f2368bdb48eedf5dba74f branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-06-30T09:20:28+03:00 summary: bpo-33974: Fix passing special characters to ttk widgets. (GH-7986) Fix passing lists and tuples of strings containing special characters '"', '\\', '{', '}' and '\n' as options to tkinter.ttk widgets. files: A Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst M Lib/test/test_tcl.py M Lib/tkinter/__init__.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index db99b75eec64..80f1668bceca 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -649,6 +649,43 @@ def test_splitdict(self): expected = {'a': (1, 2, 3), 'something': 'foo', 'status': ''} self.assertEqual(splitdict(tcl, arg), expected) + def test_join(self): + join = tkinter._join + tcl = self.interp.tk + def unpack(s): + return tcl.call('lindex', s, 0) + def check(value): + self.assertEqual(unpack(join([value])), value) + self.assertEqual(unpack(join([value, 0])), value) + self.assertEqual(unpack(unpack(join([[value]]))), value) + self.assertEqual(unpack(unpack(join([[value, 0]]))), value) + self.assertEqual(unpack(unpack(join([[value], 0]))), value) + self.assertEqual(unpack(unpack(join([[value, 0], 0]))), value) + check('') + check('spam') + check('sp am') + check('sp\tam') + check('sp\nam') + check(' \t\n') + check('{spam}') + check('{sp am}') + check('"spam"') + check('"sp am"') + check('{"spam"}') + check('"{spam}"') + check('sp\\am') + check('"sp\\am"') + check('"{}" "{}"') + check('"\\') + check('"{') + check('"}') + check('\n\\') + check('\n{') + check('\n}') + check('\\\n') + check('{\n') + check('}\n') + def test_new_tcl_obj(self): self.assertRaises(TypeError, _tkinter.Tcl_Obj) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index b78191e2777f..ff85f837d1d5 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -61,7 +61,7 @@ def _stringify(value): if isinstance(value, (list, tuple)): if len(value) == 1: value = _stringify(value[0]) - if value[0] == '{': + if _magic_re.search(value): value = '{%s}' % value else: value = '{%s}' % _join(value) @@ -72,7 +72,10 @@ def _stringify(value): elif _magic_re.search(value): # add '\' before special characters and spaces value = _magic_re.sub(r'\\\1', value) + value = value.replace('\n', r'\n') value = _space_re.sub(r'\\\1', value) + if value[0] == '"': + value = '\\' + value elif value[0] == '"' or _space_re.search(value): value = '{%s}' % value return value diff --git a/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst new file mode 100644 index 000000000000..8c03babd4f2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-06-28-14-56-44.bpo-33974.SA8nNP.rst @@ -0,0 +1,3 @@ +Fixed passing lists and tuples of strings containing special characters +``"``, ``\``, ``{``, ``}`` and ``\n`` as options to :mod:`~tkinter.ttk` +widgets.

1 0

Fix redundant declaration of _PyImport_AddModuleObject (GH-7992)
by Miss Islington (bot) June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/c919252a28f4e9dd326dc2c703b4eee6e2… commit: c919252a28f4e9dd326dc2c703b4eee6e247be83 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T16:03:07-07:00 summary: Fix redundant declaration of _PyImport_AddModuleObject (GH-7992) (cherry picked from commit f874bd1f0630644f3e3faaa2d51e6749465c70bd) Co-authored-by: Jeremy Cline <jeremy(a)jcline.org> files: M Include/import.h diff --git a/Include/import.h b/Include/import.h index 13f32a1004cf..c664803478a5 100644 --- a/Include/import.h +++ b/Include/import.h @@ -54,9 +54,6 @@ PyAPI_FUNC(PyObject *) PyImport_AddModuleObject( PyObject *name ); #endif -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *); -#endif PyAPI_FUNC(PyObject *) PyImport_AddModule( const char *name /* UTF-8 encoded string */ );

1 0

Fix redundant declaration of _PyImport_AddModuleObject (GH-7992)
by Eric Snow June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/f874bd1f0630644f3e3faaa2d51e674946… commit: f874bd1f0630644f3e3faaa2d51e6749465c70bd branch: master author: Jeremy Cline <jeremy(a)jcline.org> committer: Eric Snow <ericsnowcurrently(a)gmail.com> date: 2018-06-29T16:47:18-06:00 summary: Fix redundant declaration of _PyImport_AddModuleObject (GH-7992) files: M Include/import.h diff --git a/Include/import.h b/Include/import.h index 13f32a1004cf..c664803478a5 100644 --- a/Include/import.h +++ b/Include/import.h @@ -54,9 +54,6 @@ PyAPI_FUNC(PyObject *) PyImport_AddModuleObject( PyObject *name ); #endif -#ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *); -#endif PyAPI_FUNC(PyObject *) PyImport_AddModule( const char *name /* UTF-8 encoded string */ );

1 0

Add zulipchat badge to readme (GH-7929)
by Mariatta June 29, 2018

June 29, 2018

https://github.com/python/cpython/commit/b57eea16d19d2cd7244eae370cb3cf68f9… commit: b57eea16d19d2cd7244eae370cb3cf68f922e2f9 branch: master author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-06-29T13:43:45-07:00 summary: Add zulipchat badge to readme (GH-7929) files: M README.rst diff --git a/README.rst b/README.rst index 382130eeec93..9f86b630fdd1 100644 --- a/README.rst +++ b/README.rst @@ -13,6 +13,11 @@ This is Python version 3.8.0 alpha 0 :alt: CPython code coverage on Codecov :target: https://codecov.io/gh/python/cpython +.. image:: https://img.shields.io/badge/zulip-join_chat-brightgreen.svg + :alt: Python Zulip chat + :target: https://python.zulipchat.com + + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation. All rights reserved.

1 0

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

June 29, 2018

https://github.com/python/cpython/commit/0464de0f9a226cfa32b803e0326c12b243… commit: 0464de0f9a226cfa32b803e0326c12b2432aba26 branch: 2.7 author: Zackery Spytz <zspytz(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-06-29T23:07:13+03:00 summary: [2.7] bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918). (GH-8013) (cherry picked from commit 23db935bcf258657682e66464bf8512def8af830) Co-authored-by: Zackery Spytz <zspytz(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 f022a4e88b8e..98c2d58d0d86 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -1619,6 +1619,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 a7257115fc90..ebaf79604013 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -2741,6 +2741,17 @@ def _get_bad_decoder(dummy): with self.maybeRaises(TypeError): t.read(42) + 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 CTextIOWrapperTest(TextIOWrapperTest): 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 bf37f72bd11f..1979539cc054 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -707,6 +707,8 @@ 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. */ @@ -1329,6 +1331,7 @@ textiowrapper_write(textio *self, PyObject *args) Py_DECREF(ret); } + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); if (self->decoder) { @@ -1534,6 +1537,7 @@ textiowrapper_read(textio *self, PyObject *args) if (final == NULL) goto fail; + textiowrapper_set_decoded_chars(self, NULL); Py_CLEAR(self->snapshot); return final; }

1 0

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

June 29, 2018

https://github.com/python/cpython/commit/d6a283b37b66ecd2d0ff43602ddc8e91b5… commit: d6a283b37b66ecd2d0ff43602ddc8e91b54a51c5 branch: 3.6 author: Zackery Spytz <zspytz(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-06-29T22:30:07+03:00 summary: [3.6] bpo-25862: Fix assertion failures in io.TextIOWrapper.tell(). (GH-3918). (GH-8012) (cherry picked from commit 23db935bcf258657682e66464bf8512def8af830) Co-authored-by: Zackery Spytz <zspytz(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 2ebfb0576f59..b577dede5da8 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -2064,6 +2064,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 0b5b033b5f88..88fd6ce4a6be 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3348,6 +3348,17 @@ def seekable(self): return True F.tell = lambda x: 0 t = self.TextIOWrapper(F(), encoding='utf-8') + 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 4638b4759701..f86a35f74448 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -696,6 +696,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. */ @@ -1367,6 +1370,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) { @@ -1602,6 +1606,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; }

1 0