From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 5 May 2019 09:25:16 +0000 (-0700)
Subject: simplify StartupImportTests (GH-13096)
X-Git-Tag: v3.7.4rc1~189
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=905ce9eeb1d1f4e8a1e914c3ec61767490d40ec6;p=thirdparty%2FPython%2Fcpython.git

simplify StartupImportTests (GH-13096)


_osx_support and copyreg are not imported from site on macOS for now.
(cherry picked from commit c4d92c8ada7ecfc479ebb1dd4a819c9202155970)

Co-authored-by: Inada Naoki <songofacandy@gmail.com>
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 655a12ddd165..568f81da40f3 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -518,15 +518,15 @@ class StartupImportTests(unittest.TestCase):
 
         # http://bugs.python.org/issue19205
         re_mods = {'re', '_sre', 'sre_compile', 'sre_constants', 'sre_parse'}
-        # _osx_support uses the re module in many placs
-        if sys.platform != 'darwin':
-            self.assertFalse(modules.intersection(re_mods), stderr)
+        self.assertFalse(modules.intersection(re_mods), stderr)
+
         # http://bugs.python.org/issue9548
         self.assertNotIn('locale', modules, stderr)
-        if sys.platform != 'darwin':
-            # http://bugs.python.org/issue19209
-            self.assertNotIn('copyreg', modules, stderr)
-        # http://bugs.python.org/issue19218>
+
+        # http://bugs.python.org/issue19209
+        self.assertNotIn('copyreg', modules, stderr)
+
+        # http://bugs.python.org/issue19218
         collection_mods = {'_collections', 'collections', 'functools',
                            'heapq', 'itertools', 'keyword', 'operator',
                            'reprlib', 'types', 'weakref'