diff options
| author |   PPed72 <paolo.pedroni@iol.it> | 2016-05-02 10:39:04 +0200 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2016-05-05 08:59:13 +0000 |
| commit | 7488e1201b5655cee6968fe29f8c68409ffcc9ad (patch) | |
| tree | b7a1ca34c82e350255109b195cc6e7ea35150bed | |
| parent | dev-python/pypy3: fix regression in tkinter (diff) | |
| download | gentoo-7488e120.tar.gz gentoo-7488e120.tar.bz2 gentoo-7488e120.zip | |
dev-python/pypy3-bin: fix regression in tkinter
Gentoo-bug: 533384
Fix binary package as well as per mgorny request
Closes: https://github.com/gentoo/gentoo/pull/1326
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
| -rw-r--r-- | dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch | 74 | ||||
| -rw-r--r-- | dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild | 1 |
2 files changed, 75 insertions, 0 deletions
diff --git a/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch b/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch new file mode 100644 index 000000000000..a92152ee845d --- /dev/null +++ b/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch @@ -0,0 +1,74 @@ +# HG changeset patch +# User Philip Jenvey <pjenvey@underboss.org> +# Date 1414136649 25200 +# Branch py3k +# Node ID 8c340acffe279d63dd2df525173713b2054619c8 +# Parent a87e6542c186bdc7408ea027aed83c62820a9c49 +issue1899: fix broken bytes usage from default + +diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py +--- a/lib_pypy/_tkinter/app.py ++++ b/lib_pypy/_tkinter/app.py +@@ -439,7 +439,7 @@ + if isinstance(s, int): + return s + s = s.encode('utf-8') +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("int*") + res = tklib.Tcl_GetBoolean(self.interp, s, v) +@@ -451,7 +451,7 @@ + if isinstance(s, int): + return s + s = s.encode('utf-8') +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("int*") + res = tklib.Tcl_GetInt(self.interp, s, v) +@@ -463,7 +463,7 @@ + if isinstance(s, float): + return s + s = s.encode('utf-8') +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("double*") + res = tklib.Tcl_GetDouble(self.interp, s, v) +@@ -472,7 +472,7 @@ + return v[0] + + def exprboolean(self, s): +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("int*") + res = tklib.Tcl_ExprBoolean(self.interp, s, v) +@@ -481,7 +481,7 @@ + return v[0] + + def exprlong(self, s): +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("long*") + res = tklib.Tcl_ExprLong(self.interp, s, v) +@@ -490,7 +490,7 @@ + return v[0] + + def exprdouble(self, s): +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + v = tkffi.new("double*") + res = tklib.Tcl_ExprDouble(self.interp, s, v) +@@ -499,7 +499,7 @@ + return v[0] + + def exprstring(self, s): +- if '\x00' in s: ++ if b'\x00' in s: + raise TypeError + res = tklib.Tcl_ExprString(self.interp, s) + if res == tklib.TCL_ERROR: diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild index adee3b6a46d6..d80da519d09d 100644 --- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild +++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild @@ -87,6 +87,7 @@ src_prepare() { "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" epatch "${FILESDIR}/2.4.0-ncurses6.patch" epatch "${FILESDIR}"/pypy3-2.4.0-libressl.patch + epatch "${FILESDIR}/pypy3-2.4.0-fix-tkinter-regression.patch" sed -e "s^@EPREFIX@^${EPREFIX}^" \ -e "s^@libdir@^$(get_libdir)^" \ |