summaryrefslogtreecommitdiff
path: root/distutils2/tests/test_util.py
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2010-12-09 07:44:59 +0100
committer?ric Araujo <merwok@netwok.org>2010-12-09 07:44:59 +0100
commitc654b7a180482e89d6aef3c317a3f295fb1b4d89 (patch)
treea3ba54847fd20b942b0028d1269b6cdec8808435 /distutils2/tests/test_util.py
parent37deb5234e6a28ada7a679350a74a09041637faf (diff)
downloaddisutils2-c654b7a180482e89d6aef3c317a3f295fb1b4d89.tar.gz
Don?t use a deprecated name
Diffstat (limited to 'distutils2/tests/test_util.py')
-rw-r--r--distutils2/tests/test_util.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/distutils2/tests/test_util.py b/distutils2/tests/test_util.py
index 785f434..72ec3cf 100644
--- a/distutils2/tests/test_util.py
+++ b/distutils2/tests/test_util.py
@@ -144,7 +144,7 @@ class UtilTestCase(support.EnvironGuard,
os.path.join = _join
self.assertEqual(convert_path('/home/to/my/stuff'),
- '/home/to/my/stuff')
+ '/home/to/my/stuff')
# win
os.sep = '\\'
@@ -156,9 +156,9 @@ class UtilTestCase(support.EnvironGuard,
self.assertRaises(ValueError, convert_path, 'home/to/my/stuff/')
self.assertEqual(convert_path('home/to/my/stuff'),
- 'home\\to\\my\\stuff')
+ 'home\\to\\my\\stuff')
self.assertEqual(convert_path('.'),
- os.curdir)
+ os.curdir)
def test_change_root(self):
# linux/mac
@@ -171,9 +171,9 @@ class UtilTestCase(support.EnvironGuard,
os.path.join = _join
self.assertEqual(change_root('/root', '/old/its/here'),
- '/root/old/its/here')
+ '/root/old/its/here')
self.assertEqual(change_root('/root', 'its/here'),
- '/root/its/here')
+ '/root/its/here')
# windows
os.name = 'nt'
@@ -190,9 +190,9 @@ class UtilTestCase(support.EnvironGuard,
os.path.join = _join
self.assertEqual(change_root('c:\\root', 'c:\\old\\its\\here'),
- 'c:\\root\\old\\its\\here')
+ 'c:\\root\\old\\its\\here')
self.assertEqual(change_root('c:\\root', 'its\\here'),
- 'c:\\root\\its\\here')
+ 'c:\\root\\its\\here')
# BugsBunny os (it's a great os)
os.name = 'BugsBunny'
@@ -203,7 +203,7 @@ class UtilTestCase(support.EnvironGuard,
def test_split_quoted(self):
self.assertEqual(split_quoted('""one"" "two" \'three\' \\four'),
- ['one', 'two', 'three', 'four'])
+ ['one', 'two', 'three', 'four'])
def test_strtobool(self):
yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1')
@@ -383,7 +383,7 @@ class UtilTestCase(support.EnvironGuard,
run_2to3([file_name])
new_content = "".join(file_handle.read())
file_handle.close()
- self.assertEquals(new_content, converted_content)
+ self.assertEqual(new_content, converted_content)
@unittest.skipIf(sys.version < '2.6', 'requires Python 2.6 or higher')
def test_run_2to3_on_doctests(self):
@@ -399,7 +399,7 @@ class UtilTestCase(support.EnvironGuard,
run_2to3([file_name], doctests_only=True)
new_content = "".join(file_handle.readlines())
file_handle.close()
- self.assertEquals(new_content, converted_content)
+ self.assertEqual(new_content, converted_content)
def test_nt_quote_args(self):