Print encoded versions of the file names in test application. Fixes #496084

diff --git a/Lib/lib-tk/tkFileDialog.py b/Lib/lib-tk/tkFileDialog.py
index 9d2af510c7ff82fd19eec6b8964232fd85386f0d..f2604bcf8511caad367fb1be3b100804e54b4736 100644 (file)
--- a/Lib/lib-tk/tkFileDialog.py
+++ b/Lib/lib-tk/tkFileDialog.py
@@ -124,6 +124,20 @@ def askdirectory (**options):
 # test stuff
 
 if __name__ == "__main__":
+    # Since the file name may contain non-ASCII characters, we need
+    # to find an encoding that likely supports the file name, and
+    # displays correctly on the terminal.
+
+    # Start off with UTF-8
+    enc = "utf-8"
+
+    # See whether CODESET is defined
+    try:
+        import locale
+        enc = locale.nl_langinfo(locale.CODESET)
+    except (ImportError, AttributeError):
+        pass
+
+    print "open", askopenfilename(filetypes=[("all filez", "*")]).encode(enc)
+    print "saveas", asksaveasfilename().encode(enc)
 
-    print "open", askopenfilename(filetypes=[("all filez", "*")])
-    print "saveas", asksaveasfilename()