Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.3
Changeset: r75143:a640fa296140
Date: 2014-12-21 10:38 +0100
http://bitbucket.org/pypy/pypy/changeset/a640fa296140/

Log:    tkinter: Fix conversion of varnames

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
@@ -26,7 +26,11 @@
 def varname_converter(input):
     if isinstance(input, Tcl_Obj):
         return input.string
-    return input.encode('utf-8')
+    if isinstance(input, str):
+        input = input.encode('utf-8')
+    if b'\0' in input:
+        raise ValueError("NUL character in string")
+    return input
 
 
 def Tcl_AppInit(app):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to