From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Tue, 2 Feb 2010 22:54:28 +0000 (+0000)
Subject: sysconfig.get_scheme_names now returns a sorted tuple
X-Git-Tag: v2.7a3~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e81b0289b68bbb0bd19e5a17b845a808a1b9f252;p=thirdparty%2FPython%2Fcpython.git

sysconfig.get_scheme_names now returns a sorted tuple
---

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 1d35082c0406..0c13bba7c755 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -343,7 +343,9 @@ def get_config_h_filename():
 
 def get_scheme_names():
     """Returns a tuple containing the schemes names."""
-    return _INSTALL_SCHEMES.keys()
+    schemes = _INSTALL_SCHEMES.keys()
+    schemes.sort()
+    return tuple(schemes)
 
 def get_path_names():
     """Returns a tuple containing the paths names."""
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index efbfe97c3ca3..0fd0910ac48f 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -15,7 +15,8 @@ from test.test_support import run_unittest, TESTFN
 import sysconfig
 from sysconfig import (get_paths, get_platform, get_config_vars,
                        get_path, get_path_names, _INSTALL_SCHEMES,
-                       _get_default_scheme, _expand_vars)
+                       _get_default_scheme, _expand_vars,
+                       get_scheme_names)
 
 class TestSysConfig(unittest.TestCase):
 
@@ -232,6 +233,11 @@ class TestSysConfig(unittest.TestCase):
         config_h = sysconfig.get_config_h_filename()
         self.assertTrue(os.path.isfile(config_h), config_h)
 
+    def test_get_scheme_names(self):
+        wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'posix_home',
+                  'posix_prefix', 'posix_user')
+        self.assertEquals(get_scheme_names(), wanted)
+
 
 def test_main():
     run_unittest(TestSysConfig)