diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/site.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_site.py | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/Lib/site.py b/Lib/site.py index 7dc1b04..950e703 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -340,11 +340,6 @@ def getsitepackages(prefixes=None): else: sitepackages.append(prefix) sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - # for framework builds *only* we add the standard Apple locations. - if sys.platform == "darwin" and sys._framework: - sitepackages.append( - os.path.join("/Library", sys._framework, - '%d.%d' % sys.version_info[:2], "site-packages")) return sitepackages def addsitepackages(known_paths, prefixes=None): diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 266adf0..b6648d6 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -261,20 +261,8 @@ class HelperFunctionsTests(unittest.TestCase): def test_getsitepackages(self): site.PREFIXES = ['xoxo'] dirs = site.getsitepackages() - - if (sys.platform == "darwin" and - sysconfig.get_config_var("PYTHONFRAMEWORK")): - # OS X framework builds - site.PREFIXES = ['Python.framework'] - dirs = site.getsitepackages() - self.assertEqual(len(dirs), 2) - wanted = os.path.join('/Library', - sysconfig.get_config_var("PYTHONFRAMEWORK"), - '%d.%d' % sys.version_info[:2], - 'site-packages') - self.assertEqual(dirs[1], wanted) - elif os.sep == '/': - # OS X non-framework builds, Linux, FreeBSD, etc + if os.sep == '/': + # OS X, Linux, FreeBSD, etc self.assertEqual(len(dirs), 1) wanted = os.path.join('xoxo', 'lib', 'python%d.%d' % sys.version_info[:2], |