mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

removed sys.platform == 'mac' usage in distutils.dir_util

Browse source
This commit is contained in:
Tarek Ziadé 2009-05-17 11:11:57 +00:00
parent 016828d119
commit 294c9d90df
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/distutils/dir_util.py
View file

@ -217,9 +217,6 @@ def ensure_relative (path):
it can be the second argument to os.path.join(). it can be the second argument to os.path.join().
""" """
drive, path = os.path.splitdrive(path) drive, path = os.path.splitdrive(path)
if sys.platform == 'mac':
return os.sep + path
else:
if path[0:1] == os.sep: if path[0:1] == os.sep:
path = drive + path[1:] path = drive + path[1:]
return path return path

14
Lib/distutils/tests/test_dir_util.py
View file

@ -3,10 +3,8 @@ import unittest
import os import os
import shutil import shutil
from distutils.dir_util import mkpath from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
from distutils.dir_util import remove_tree ensure_relative)
from distutils.dir_util import create_tree
from distutils.dir_util import copy_tree
from distutils import log from distutils import log
from distutils.tests import support from distutils.tests import support
@ -85,6 +83,14 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
remove_tree(self.root_target, verbose=0) remove_tree(self.root_target, verbose=0)
remove_tree(self.target2, 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(): def test_suite():
return unittest.makeSuite(DirUtilTestCase) return unittest.makeSuite(DirUtilTestCase)