Skip to content

Commit 4a0abfd

Browse files
authored
Merge pull request PySimpleGUI#4323 from PySimpleGUI/Dev-latest
Changed get_versions to be more clear. Exclude canvas from return va…
2 parents 1f7b674 + d6dbcb7 commit 4a0abfd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

PySimpleGUI.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python3
22

3-
version = __version__ = "4.43.0 Released 23-May-2021"
3+
version = __version__ = "4.43.0.1 Unreleased\nChanged get_versions string to be more clear, removed canvas from return values"
44

55
__version__ = version.split()[0] # For PEP 396 and PEP 345
66

@@ -8782,7 +8782,7 @@ def _BuildKeyDictForWindow(self, top_window, window, key_dict):
87828782
element.Key = element.ButtonText
87838783
elif element.Type == ELEM_TYPE_TAB:
87848784
element.Key = element.Title
8785-
if element.Type in (ELEM_TYPE_MENUBAR, ELEM_TYPE_BUTTONMENU, ELEM_TYPE_CANVAS,
8785+
if element.Type in (ELEM_TYPE_MENUBAR, ELEM_TYPE_BUTTONMENU,
87868786
ELEM_TYPE_INPUT_SLIDER, ELEM_TYPE_GRAPH, ELEM_TYPE_IMAGE,
87878787
ELEM_TYPE_INPUT_CHECKBOX, ELEM_TYPE_INPUT_LISTBOX, ELEM_TYPE_INPUT_COMBO,
87888788
ELEM_TYPE_INPUT_MULTILINE, ELEM_TYPE_INPUT_OPTION_MENU, ELEM_TYPE_INPUT_SPIN,
@@ -18473,9 +18473,8 @@ def execute_get_results(subprocess_id, timeout=None):
1847318473
if err:
1847418474
err_decoded = err.decode("utf-8")
1847518475
except Exception as e:
18476-
print('Error in execute_get_results', e)
18476+
popup_error('Error in execute_get_results', e)
1847718477
out_decoded = err_decoded = None
18478-
1847918478
return out_decoded, err_decoded
1848018479

1848118480

@@ -19192,7 +19191,7 @@ def get_versions():
1919219191
:return:
1919319192
:rtype: str
1919419193
"""
19195-
versions = "Python version: {}.{}.{}\nPort: tkinter\n{} version: {}\nPySimpleGUI version: {}\nPySimpleGUI filename: {}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro, port, tclversion_detailed, ver, __file__)
19194+
versions = "Python version: {}.{}.{}\nPort: {}\ntkinter version: {}\nPySimpleGUI version: {}\nPySimpleGUI filename: {}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro, port, tclversion_detailed, ver, __file__)
1919619195
return versions
1919719196

1919819197
#==================================================#

0 commit comments

Comments
 (0)