From: native-api <vano@mail.mipt.ru>
Date: Thu, 20 May 2021 10:25:37 +0000 (+0300)
Subject: bpo-36160: Fix test_site so that it can run independently of other tests (GH-12131)
X-Git-Tag: v3.11.0a1~1072
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1270ad6ec8fe1f71e7d88086474f96f99670ac3a;p=thirdparty%2FPython%2Fcpython.git

bpo-36160: Fix test_site so that it can run independently of other tests (GH-12131)
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 9b4ab42a727b..fa74e7770ede 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -79,8 +79,10 @@ class HelperFunctionsTests(unittest.TestCase):
         site.USER_SITE = self.old_site
         site.PREFIXES = self.old_prefixes
         sysconfig._CONFIG_VARS = self.original_vars
-        sysconfig._CONFIG_VARS.clear()
-        sysconfig._CONFIG_VARS.update(self.old_vars)
+        # _CONFIG_VARS is None before get_config_vars() is called
+        if sysconfig._CONFIG_VARS is not None:
+            sysconfig._CONFIG_VARS.clear()
+            sysconfig._CONFIG_VARS.update(self.old_vars)
 
     def test_makepath(self):
         # Test makepath() have an absolute path for its first return value