From 77e0abe228564a5be23284bd8e963c11952eb55b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 13 Oct 2018 17:19:22 -0700 Subject: [PATCH] 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 --- Lib/idlelib/pyshell.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index 5458c59dbd7..47eef4399ce 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