diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-05-05 19:11:21 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-05-05 19:11:21 (GMT) |
commit | 94f25283c9b6cb43791e23618b9bec0cc961a7cb (patch) | |
tree | c32622183a1e7020de5afb458288be48449a60a6 /Lib/distutils | |
parent | a045f191b4670bbf201d6d56a50886694c26da3e (diff) | |
download | cpython-94f25283c9b6cb43791e23618b9bec0cc961a7cb.zip cpython-94f25283c9b6cb43791e23618b9bec0cc961a7cb.tar.gz cpython-94f25283c9b6cb43791e23618b9bec0cc961a7cb.tar.bz2 |
Remove traces of MacOS9 support.
Fix for issue #7908
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/command/install.py | 14 | ||||
-rw-r--r-- | Lib/distutils/file_util.py | 9 | ||||
-rw-r--r-- | Lib/distutils/util.py | 9 |
3 files changed, 0 insertions, 32 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 31d0387..3c28c66 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -65,20 +65,6 @@ INSTALL_SCHEMES = { 'scripts': '$userbase/Scripts', 'data' : '$userbase', }, - 'mac': { - 'purelib': '$base/Lib/site-packages', - 'platlib': '$base/Lib/site-packages', - 'headers': '$base/Include/$dist_name', - 'scripts': '$base/Scripts', - 'data' : '$base', - }, - 'mac_user': { - 'purelib': '$usersite', - 'platlib': '$usersite', - 'headers': '$userbase/$py_version_short/include/$dist_name', - 'scripts': '$userbase/bin', - 'data' : '$userbase', - }, 'os2': { 'purelib': '$base/Lib/site-packages', 'platlib': '$base/Lib/site-packages', diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py index 758bde3..3a71bfd 100644 --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -132,15 +132,6 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, if dry_run: return (dst, 1) - # On Mac OS, use the native file copy routine - if os.name == 'mac': - import macostools - try: - macostools.copy(src, dst, 0, preserve_times) - except os.error as exc: - raise DistutilsFileError( - "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1])) - # If linking (hard or symbolic), use the appropriate system call # (Unix only, of course, but that's the caller's responsibility) elif link == 'hard': diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 8fd2ca0..c8bf006 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -91,15 +91,6 @@ def change_root(new_root, pathname): path = path[1:] return os.path.join(new_root, path) - elif os.name == 'mac': - if not os.path.isabs(pathname): - return os.path.join(new_root, pathname) - else: - # Chop off volume name from start of path - elements = pathname.split(":", 1) - pathname = ":" + elements[1] - return os.path.join(new_root, pathname) - else: raise DistutilsPlatformError("nothing known about " "platform '%s'" % os.name) |