Merged revisions 72727 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72727 | tarek.ziade | 2009-05-17 13:11:57 +0200 (Sun, 17 May 2009) | 1 line
removed sys.platform == 'mac' usage in distutils.dir_util
........
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index ed54cce..82608d2 100644
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -208,14 +208,11 @@
exc, "error removing %s: " % directory))
-def ensure_relative (path):
+def ensure_relative(path):
"""Take the full path 'path', and make it a relative path so
it can be the second argument to os.path.join().
"""
drive, path = os.path.splitdrive(path)
- if sys.platform == 'mac':
- return os.sep + path
- else:
- if path[0:1] == os.sep:
- path = drive + path[1:]
- return path
+ if path[0:1] == os.sep:
+ path = drive + path[1:]
+ return path
diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index bf416b6..9bd6530 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -3,10 +3,8 @@
import os
import shutil
-from distutils.dir_util import mkpath
-from distutils.dir_util import remove_tree
-from distutils.dir_util import create_tree
-from distutils.dir_util import copy_tree
+from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
+ ensure_relative)
from distutils import log
from distutils.tests import support
@@ -85,6 +83,14 @@
remove_tree(self.root_target, verbose=0)
remove_tree(self.target2, verbose=0)
+ def test_ensure_relative(self):
+ if os.sep == '/':
+ self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
+ self.assertEquals(ensure_relative('some/path'), 'some/path')
+ else: # \\
+ self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+ self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
+
def test_suite():
return unittest.makeSuite(DirUtilTestCase)