From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 24 May 2020 11:08:04 +0000 (-0700)
Subject: bpo-40723: Make IDLE autocomplete test run without __main__.__file__ (GH-20311)
X-Git-Tag: v3.8.4rc1~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a64df485a4c3ebb0caa1d62c02246cd43d0e976e;p=thirdparty%2FPython%2Fcpython.git

bpo-40723: Make IDLE autocomplete test run without __main__.__file__ (GH-20311)


This was the only failure running unittest.main(test.test_idle) after imports.
(cherry picked from commit 905b3cd05f8d2c29e1605d109900e3e9d07af4d3)

Co-authored-by: Florian Dahlitz <f2dahlitz@freenet.de>
---

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index de7543e37019..debd2c79bf2a 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ Released on 2019-12-16?
 ======================================
 
 
+bpo-40723: Make test_idle pass when run after import.
+
 bpo-38689: IDLE will no longer freeze when inspect.signature fails
 when fetching a calltip.
 
diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py
index 2c478cd5c2a1..1841495fcf1a 100644
--- a/Lib/idlelib/idle_test/test_autocomplete.py
+++ b/Lib/idlelib/idle_test/test_autocomplete.py
@@ -227,7 +227,7 @@ class AutoCompleteTest(unittest.TestCase):
         acp = self.autocomplete
         small, large = acp.fetch_completions(
                 '', ac.ATTRS)
-        if __main__.__file__ != ac.__file__:
+        if hasattr(__main__, '__file__') and __main__.__file__ != ac.__file__:
             self.assertNotIn('AutoComplete', small)  # See issue 36405.
 
         # Test attributes
diff --git a/Misc/NEWS.d/next/IDLE/2020-05-24-06-19-43.bpo-40723.AJLd4U.rst b/Misc/NEWS.d/next/IDLE/2020-05-24-06-19-43.bpo-40723.AJLd4U.rst
new file mode 100644
index 000000000000..e0de2f9d8366
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2020-05-24-06-19-43.bpo-40723.AJLd4U.rst
@@ -0,0 +1 @@
+Make test_idle pass when run after import.