[Python-checkins] distutils2: Forgot to convert two literals to os.curdir

[tarek.ziade]

tarek.ziade pushed 31cf5ffe9bf1 to distutils2:

http://hg.python.org/distutils2/rev/31cf5ffe9bf1
changeset:   478:31cf5ffe9bf1
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Aug 05 17:26:26 2010 +0200
summary:     Forgot to convert two literals to os.curdir
files:       src/distutils2/tests/__init__.py, src/distutils2/tests/test_cmd.py

diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py
--- a/src/distutils2/tests/__init__.py
+++ b/src/distutils2/tests/__init__.py
@@ -23,7 +23,7 @@
 
 from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
 
-here = os.path.dirname(__file__) or '.'
+here = os.path.dirname(__file__) or os.curdir
 
 verbose = 1
 
diff --git a/src/distutils2/tests/test_cmd.py b/src/distutils2/tests/test_cmd.py
--- a/src/distutils2/tests/test_cmd.py
+++ b/src/distutils2/tests/test_cmd.py
@@ -98,7 +98,7 @@
 
     def test_ensure_dirname(self):
         cmd = self.cmd
-        cmd.option1 = os.path.dirname(__file__) or '.'
+        cmd.option1 = os.path.dirname(__file__) or os.curdir
         cmd.ensure_dirname('option1')
         cmd.option2 = 'xxx'
         self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')

--
Repository URL: http://hg.python.org/distutils2