ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-04 19:40:02 +03:00
Code Issues Projects Releases Wiki Activity

[2199] Add Broader Exception

Browse Source
This commit is contained in:
David Sangrey 2024-04-14 18:07:30 -04:00
parent 15f4cccbed
commit 0410806152
No known key found for this signature in database
GPG Key ID: 3AEADBB0186884BC
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
killswitch.py
View File

@ -361,8 +361,8 @@ def fetch_kill_switches(target=DEFAULT_KILLSWITCH_URL) -> KillSwitchJSONFile | N
logger.warning(f"Failed to get kill switches, data was invalid: {e}")
return None
except (requests.exceptions.BaseHTTPError, requests.exceptions.ConnectionError) as e: # type: ignore
logger.warning(f"unable to connect to {target!r}: {e}")
except requests.exceptions.RequestException as requ_err:
logger.warning(f"unable to connect to {target!r}: {requ_err}")
return None
return data

6
myNotebook.py
View File

@ -63,11 +63,11 @@ class Label(tk.Label):
super().__init__(master, **kw)
class EntryMenu(ttk.Entry):
class EntryMenu:
"""Extended entry widget that includes a context menu with Copy, Cut-and-Paste commands."""
def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
ttk.Entry.__init__(self, *args, **kwargs)
self.menu = tk.Menu(self, tearoff=False)
self.menu.add_command(label="Copy", command=self.copy)
@ -120,7 +120,7 @@ class EntryMenu(ttk.Entry):
pass
class Entry(ttk.Entry or EntryMenu): # type: ignore
class Entry(ttk.Entry, EntryMenu):
"""Custom t(t)k.Entry class to fix some display issues."""
# DEPRECATED: Migrate to ttk.Entry or EntryMenu. Will remove in 5.12 or later.