diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-10-16 23:43:46 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-10-16 23:43:46 +0000 |
| commit | e15ec4604a606259051dbc7ecdfd2fbd7e862ecb (patch) | |
| tree | 50fcf9dc78e2cf2726c4ab05a4f1bf09a286ee6f /dev-lang/python/files | |
| parent | pyzor: fix python 2.6/2.7 deprecation warnings (diff) | |
| download | gentoo-2-e15ec4604a606259051dbc7ecdfd2fbd7e862ecb.tar.gz gentoo-2-e15ec4604a606259051dbc7ecdfd2fbd7e862ecb.tar.bz2 gentoo-2-e15ec4604a606259051dbc7ecdfd2fbd7e862ecb.zip | |
Apply upstream fix for regression in Tkinter, bug 488208 by jlec.
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-lang/python/files')
| -rw-r--r-- | dev-lang/python/files/python-2.7-issue16248.patch | 19 | ||||
| -rw-r--r-- | dev-lang/python/files/python-3.2-issue16248.patch | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/dev-lang/python/files/python-2.7-issue16248.patch b/dev-lang/python/files/python-2.7-issue16248.patch new file mode 100644 index 000000000000..ce9c654c565f --- /dev/null +++ b/dev-lang/python/files/python-2.7-issue16248.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Antoine Pitrou <solipsis@pitrou.net> +# Date 1375388712 -7200 +# Node ID 0f17aed78168e63ec058c219d03cea7240f83dd6 +# Parent bb546f6d8ab4f513804d7a420657963881e5b447 +Fix tkinter regression introduced by the security fix in #16248. + +diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py +--- a/Lib/lib-tk/Tkinter.py ++++ b/Lib/lib-tk/Tkinter.py +@@ -1736,7 +1736,7 @@ class Tk(Misc, Wm): + # ensure that self.tk is always _something_. + self.tk = None + if baseName is None: +- import sys, os ++ import os + baseName = os.path.basename(sys.argv[0]) + baseName, ext = os.path.splitext(baseName) + if ext not in ('.py', '.pyc', '.pyo'): diff --git a/dev-lang/python/files/python-3.2-issue16248.patch b/dev-lang/python/files/python-3.2-issue16248.patch new file mode 100644 index 000000000000..d0e80cae7283 --- /dev/null +++ b/dev-lang/python/files/python-3.2-issue16248.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Georg Brandl <georg@python.org> +# Date 1379142489 -7200 +# Node ID c18c18774e240377d47638fb23e8276c1ac2e606 +# Parent b9b521efeba385af0142988899a55de1c1c805c7 +Fix tkinter regression introduced by the security fix in #16248. + +diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py +--- a/Lib/tkinter/__init__.py ++++ b/Lib/tkinter/__init__.py +@@ -1722,7 +1722,7 @@ class Tk(Misc, Wm): + # ensure that self.tk is always _something_. + self.tk = None + if baseName is None: +- import sys, os ++ import os + baseName = os.path.basename(sys.argv[0]) + baseName, ext = os.path.splitext(baseName) + if ext not in ('.py', '.pyc', '.pyo'): |