From: Victor Stinner <vstinner@redhat.com>
Date: Mon, 26 Nov 2018 11:37:34 +0000 (+0100)
Subject: bpo-35313: Cleanup test_embed.py (GH-10716)
X-Git-Tag: v3.8.0a1~429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0b366a8d7e0f12d4448f570e990de414f4afca7;p=thirdparty%2FPython%2Fcpython.git

bpo-35313: Cleanup test_embed.py (GH-10716)

* Remove an unused import.
* Move get_expected_config() call to check_config() to ease backport
  to Python 3.7.
---

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index b6c25e3f7eda..d35b9f4d5a2f 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -408,7 +408,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
 
         code = textwrap.dedent('''
             import json
-            import locale
             import sys
 
             data = {
@@ -449,8 +448,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
                 expected[key] = config[key]
         return expected
 
-    def check_core_config(self, config, expected, env):
-        expected = self.get_expected_config(expected, env)
+    def check_core_config(self, config, expected):
         core_config = dict(config['core_config'])
         for key in self.UNTESTED_CORE_CONFIG:
             core_config.pop(key, None)
@@ -485,7 +483,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         # Ignore err
         config = json.loads(out)
 
-        self.check_core_config(config, expected, env)
+        expected = self.get_expected_config(expected, env)
+        self.check_core_config(config, expected)
         self.check_main_config(config)
         self.check_global_config(config)