commit ec177c14d326a06204f0922bc61565b60589ba82
author Éric Araujo <merwok@netwok.org> Sun Jun 24 03:27:43 2012 -0400
committer Éric Araujo <merwok@netwok.org> Sun Jun 24 03:27:43 2012 -0400
tree a4d0ed1a9eb3e468df71174829c5a4425bf0f9d5
parent 853ef475228e6fb9683209b361878e8f610e3762

Packaging removal: also revert introduction of sysconfig.cfg.

We need a discussion to define what should be customized how; this new
config file is premature.  It was added to serve the needs of the
resources system in install_data / packaging.database, so it can be
removed alongside packaging for 3.3.

Lib/test/regrtest.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index f528e63..90931e7 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -966,7 +966,7 @@
                  'logging._handlers', 'logging._handlerList', 'sys.gettrace',
                  'sys.warnoptions', 'threading._dangling',
                  'multiprocessing.process._dangling',
-                 'sysconfig._CONFIG_VARS', 'sysconfig._SCHEMES',
+                 'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
                  'support.TESTFN',
                 )
 
@@ -1113,15 +1113,13 @@
         sysconfig._CONFIG_VARS.clear()
         sysconfig._CONFIG_VARS.update(saved[2])
 
-    def get_sysconfig__SCHEMES(self):
-        # it's mildly evil to look at the internal attribute, but it's easier
-        # than copying a RawConfigParser object
-        return (id(sysconfig._SCHEMES), sysconfig._SCHEMES._sections,
-                sysconfig._SCHEMES._sections.copy())
-    def restore_sysconfig__SCHEMES(self, saved):
-        sysconfig._SCHEMES._sections = saved[1]
-        sysconfig._SCHEMES._sections.clear()
-        sysconfig._SCHEMES._sections.update(saved[2])
+    def get_sysconfig__INSTALL_SCHEMES(self):
+        return (id(sysconfig._INSTALL_SCHEMES), sysconfig._INSTALL_SCHEMES,
+                sysconfig._INSTALL_SCHEMES.copy())
+    def restore_sysconfig__INSTALL_SCHEMES(self, saved):
+        sysconfig._INSTALL_SCHEMES = saved[1]
+        sysconfig._INSTALL_SCHEMES.clear()
+        sysconfig._INSTALL_SCHEMES.update(saved[2])
 
     def get_support_TESTFN(self):
         if os.path.isfile(support.TESTFN):

Lib/test/test_sysconfig.py

diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index e583793..3cb63ed 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -10,7 +10,7 @@
 
 import sysconfig
 from sysconfig import (get_paths, get_platform, get_config_vars,
-                       get_path, get_path_names, _SCHEMES,
+                       get_path, get_path_names, _INSTALL_SCHEMES,
                        _get_default_scheme, _expand_vars,
                        get_scheme_names, get_config_var, _main)
 
@@ -36,8 +36,7 @@
         self.join = os.path.join
         self.isabs = os.path.isabs
         self.splitdrive = os.path.splitdrive
-        self._config_vars = sysconfig._CONFIG_VARS
-        sysconfig._CONFIG_VARS = copy(sysconfig._CONFIG_VARS)
+        self._config_vars = sysconfig._CONFIG_VARS, copy(sysconfig._CONFIG_VARS)
         self._added_envvars = []
         self._changed_envvars = []
         for var in ('MACOSX_DEPLOYMENT_TARGET', 'PATH'):
@@ -60,7 +59,9 @@
         os.path.join = self.join
         os.path.isabs = self.isabs
         os.path.splitdrive = self.splitdrive
-        sysconfig._CONFIG_VARS = self._config_vars
+        sysconfig._CONFIG_VARS = self._config_vars[0]
+        sysconfig._CONFIG_VARS.clear()
+        sysconfig._CONFIG_VARS.update(self._config_vars[1])
         for var, value in self._changed_envvars:
             os.environ[var] = value
         for var in self._added_envvars:
@@ -82,7 +83,7 @@
             shutil.rmtree(path)
 
     def test_get_path_names(self):
-        self.assertEqual(get_path_names(), _SCHEMES.options('posix_prefix'))
+        self.assertEqual(get_path_names(), sysconfig._SCHEME_KEYS)
 
     def test_get_paths(self):
         scheme = get_paths()
@@ -94,8 +95,8 @@
 
     def test_get_path(self):
         # XXX make real tests here
-        for scheme in _SCHEMES:
-            for name in _SCHEMES[scheme]:
+        for scheme in _INSTALL_SCHEMES:
+            for name in _INSTALL_SCHEMES[scheme]:
                 res = get_path(name, scheme)
 
     def test_get_config_vars(self):