diff options
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | pkg_resources.py | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index f8d0af90..228f0edd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,10 @@ setuptools pkg_resources ------------- +* Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API + instead. Based on a patch from ronaldoussoren. This closes + http://bitbucket.org/tarek/distribute/issue/5. + * Fixed a SandboxViolation for mkdir that could occur in certain cases. This closes http://bitbucket.org/tarek/distribute/issue/13. diff --git a/pkg_resources.py b/pkg_resources.py index fe257754..9ec094a1 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -166,14 +166,9 @@ def get_provider(moduleOrReq): def _macosx_vers(_cache=[]): if not _cache: - info = os.popen('/usr/bin/sw_vers').read().splitlines() - for line in info: - key, value = line.split(None, 1) - if key == 'ProductVersion:': - _cache.append(value.strip().split(".")) - break - else: - raise ValueError, "What?!" + import platform + version = platform.mac_ver()[0] + _cache.append(version.split('.')) return _cache[0] def _macosx_arch(machine): |