[Python-checkins] cpython (3.4): Issue #21580: Now Tkinter correctly handles bytes arguments passed to Tk.
serhiy.storchaka
python-checkins at python.org
Wed Jul 30 17:34:19 CEST 2014
http://hg.python.org/cpython/rev/9474f2971855
changeset: 91940:9474f2971855
branch: 3.4
parent: 91937:31f4cb1fede9
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Jul 30 18:33:13 2014 +0300
summary:
Issue #21580: Now Tkinter correctly handles bytes arguments passed to Tk.
In particular this allows to initialize images from binary data.
files:
Lib/test/test_tcl.py | 24 ++++++---
Lib/tkinter/test/test_tkinter/test_images.py | 5 --
Misc/NEWS | 3 +
Modules/_tkinter.c | 4 +-
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -389,8 +389,12 @@
self.assertEqual(passValue('str\x00ing'), 'str\x00ing')
self.assertEqual(passValue('str\x00ing\xbd'), 'str\x00ing\xbd')
self.assertEqual(passValue('str\x00ing\u20ac'), 'str\x00ing\u20ac')
- self.assertEqual(passValue(b'str\x00ing'), 'str\x00ing')
- self.assertEqual(passValue(b'str\xc0\x80ing'), 'str\x00ing')
+ self.assertEqual(passValue(b'str\x00ing'),
+ b'str\x00ing' if self.wantobjects else 'str\x00ing')
+ self.assertEqual(passValue(b'str\xc0\x80ing'),
+ b'str\xc0\x80ing' if self.wantobjects else 'str\xc0\x80ing')
+ self.assertEqual(passValue(b'str\xbding'),
+ b'str\xbding' if self.wantobjects else 'str\xbding')
for i in (0, 1, -1, 2**31-1, -2**31):
self.assertEqual(passValue(i), i if self.wantobjects else str(i))
for f in (0.0, 1.0, -1.0, 1/3,
@@ -438,12 +442,14 @@
check('string\xbd', 'string\xbd')
check('string\u20ac', 'string\u20ac')
check(b'string', 'string')
- check(b'string\xe2\x82\xac', 'string\u20ac')
+ check(b'string\xe2\x82\xac', 'string\xe2\x82\xac')
+ check(b'string\xbd', 'string\xbd')
check('str\x00ing', 'str\x00ing')
check('str\x00ing\xbd', 'str\x00ing\xbd')
check('str\x00ing\u20ac', 'str\x00ing\u20ac')
- check(b'str\xc0\x80ing', 'str\x00ing')
- check(b'str\xc0\x80ing\xe2\x82\xac', 'str\x00ing\u20ac')
+ check(b'str\x00ing', 'str\x00ing')
+ check(b'str\xc0\x80ing', 'str\xc0\x80ing')
+ check(b'str\xc0\x80ing\xe2\x82\xac', 'str\xc0\x80ing\xe2\x82\xac')
for i in (0, 1, -1, 2**31-1, -2**31):
check(i, str(i))
for f in (0.0, 1.0, -1.0):
@@ -488,9 +494,9 @@
if tcl_version >= (8, 5):
if not self.wantobjects or get_tk_patchlevel() < (8, 5, 5):
# Before 8.5.5 dicts were converted to lists through string
- expected = ('12', '\u20ac', '\u20ac', '3.4')
+ expected = ('12', '\u20ac', '\xe2\x82\xac', '3.4')
else:
- expected = (12, '\u20ac', '\u20ac', (3.4,))
+ expected = (12, '\u20ac', b'\xe2\x82\xac', (3.4,))
testcases += [
(call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),
expected),
@@ -535,9 +541,9 @@
if tcl_version >= (8, 5):
if not self.wantobjects or get_tk_patchlevel() < (8, 5, 5):
# Before 8.5.5 dicts were converted to lists through string
- expected = ('12', '\u20ac', '\u20ac', '3.4')
+ expected = ('12', '\u20ac', '\xe2\x82\xac', '3.4')
else:
- expected = (12, '\u20ac', '\u20ac', (3.4,))
+ expected = (12, '\u20ac', b'\xe2\x82\xac', (3.4,))
testcases += [
(call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),
expected),
diff --git a/Lib/tkinter/test/test_tkinter/test_images.py b/Lib/tkinter/test/test_tkinter/test_images.py
--- a/Lib/tkinter/test/test_tkinter/test_images.py
+++ b/Lib/tkinter/test/test_tkinter/test_images.py
@@ -161,21 +161,18 @@
def test_create_from_ppm_file(self):
self.check_create_from_file('ppm')
- @unittest.skip('issue #21580')
def test_create_from_ppm_data(self):
self.check_create_from_data('ppm')
def test_create_from_pgm_file(self):
self.check_create_from_file('pgm')
- @unittest.skip('issue #21580')
def test_create_from_pgm_data(self):
self.check_create_from_data('pgm')
def test_create_from_gif_file(self):
self.check_create_from_file('gif')
- @unittest.skip('issue #21580')
def test_create_from_gif_data(self):
self.check_create_from_data('gif')
@@ -183,12 +180,10 @@
def test_create_from_png_file(self):
self.check_create_from_file('png')
- @unittest.skip('issue #21580')
@requires_tcl(8, 6)
def test_create_from_png_data(self):
self.check_create_from_data('png')
- @unittest.skip('issue #21580')
def test_configure_data(self):
image = tkinter.PhotoImage('::img::test', master=self.root)
self.assertEqual(image['data'], '')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@
Library
-------
+- Issue #21580: Now Tkinter correctly handles bytes arguments passed to Tk.
+ In particular this allows to initialize images from binary data.
+
- Issue #17172: Make turtledemo start as active on OS X even when run with
subprocess. Patch by Lita Cho.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -881,8 +881,8 @@
int overflow;
if (PyBytes_Check(value))
- return Tcl_NewStringObj(PyBytes_AS_STRING(value),
- PyBytes_GET_SIZE(value));
+ return Tcl_NewByteArrayObj((unsigned char *)PyBytes_AS_STRING(value),
+ PyBytes_GET_SIZE(value));
else if (PyBool_Check(value))
return Tcl_NewBooleanObj(PyObject_IsTrue(value));
else if (PyLong_CheckExact(value) &&
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list