Skip to content

gh-103878: Ensure canceled file dialog returns "" #111195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrstphrchvz wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −0
Open

gh-103878: Ensure canceled file dialog returns "" #111195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39397de
gh-103878: Ensure canceled file dialog returns `""`
chrstphrchvz Oct 23, 2023
2bf54aa
Merge branch 'main' into patch-gh103878
chrstphrchvz Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Lib/tkinter/filedialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,10 @@ def _fixoptions(self):
pass

def _fixresult(self, widget, result):
# gh-103878: empty string from Tcl may have non-string type
if result in ((), b''):
result = ''

if result:
# keep directory and filename until next time
# convert Tcl path objects to strings
Expand All @@ -335,6 +339,10 @@ class Open(_Dialog):
command = "tk_getOpenFile"

def _fixresult(self, widget, result):
# gh-103878: empty string from Tcl may have non-string type
if result in ((), b''):
result = ''

if isinstance(result, tuple):
# multiple results:
result = tuple([getattr(r, "string", r) for r in result])
Expand Down Expand Up @@ -362,6 +370,10 @@ class Directory(commondialog.Dialog):
command = "tk_chooseDirectory"

def _fixresult(self, widget, result):
# gh-103878: empty string from Tcl may have non-string type
if result in ((), b''):
result = ''

if result:
# convert Tcl path objects to strings
try:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-10-23-01-00-00.gh-issue-103878.molDay.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure Tkinter file dialogs return ``""`` rather than ``()`` or ``b""``
when canceled.