From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 14 Oct 2018 00:28:04 +0000 (-0700)
Subject: bpo-33656: Move pyshell ctypes import inside try block. (GH-9858)
X-Git-Tag: v3.6.8rc1~229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68299305c7898eb8eb0cea6cad19c299d0d1ba2d;p=thirdparty%2FPython%2Fcpython.git

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>
---

diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 5458c59dbd7e..47eef4399ce6 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