diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-10-14 00:28:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 00:28:04 (GMT) |
| commit | 68299305c7898eb8eb0cea6cad19c299d0d1ba2d (patch) | |
| tree | 15642ef0eabb2abc840393ac0e9ea06a384b6303 | |
| parent | 82ff58338866b935e3df0b3fba166ed885b8bbfe (diff) | |
| download | cpython-68299305c7898eb8eb0cea6cad19c299d0d1ba2d.zip cpython-68299305c7898eb8eb0cea6cad19c299d0d1ba2d.tar.gz cpython-68299305c7898eb8eb0cea6cad19c299d0d1ba2d.tar.bz2 | |
bpo-33656: Move pyshell ctypes import inside try block. (GH-9858)
A Windows build with _tkinter, tkinter, and idlelib
but without ctypes is unlikely but apparently possible.
(cherry picked from commit d274afb5e579a5d9d990f68f9af856cf4c918779)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
| -rwxr-xr-x | Lib/idlelib/pyshell.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 5458c59..47eef43 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -12,11 +12,11 @@ except ImportError: # Valid arguments for the ...Awareness call below are defined in the following. # https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).aspx if sys.platform == 'win32': - import ctypes - PROCESS_SYSTEM_DPI_AWARE = 1 try: + import ctypes + PROCESS_SYSTEM_DPI_AWARE = 1 ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE) - except (AttributeError, OSError): + except (ImportError, AttributeError, OSError): pass import tkinter.messagebox as tkMessageBox |