summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_fileinput.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-15 20:10:33 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-15 20:10:33 (GMT)
commit8213cafd62a70881d38f9f8e88097b5af4bf998d (patch)
treed3beb5479792820d772b2ae2ec489375f4b17216 /Lib/test/test_fileinput.py
parent0e63f594928ac8b4551c0f46284744a246b179fd (diff)
parent0de5fc51ff66838b5133bf4656af6a3023232b1c (diff)
downloadcpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.zip
cpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.tar.gz
cpython-8213cafd62a70881d38f9f8e88097b5af4bf998d.tar.bz2
Merge
Diffstat (limited to 'Lib/test/test_fileinput.py')
-rw-r--r--Lib/test/test_fileinput.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index 7afb88c..27ceaf6 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -277,7 +277,7 @@ class FileInputTests(unittest.TestCase):
def test_empty_files_list_specified_to_constructor(self):
with FileInput(files=[]) as fi:
- self.assertEquals(fi._files, ('-',))
+ self.assertEqual(fi._files, ('-',))
def test__getitem__(self):
"""Tests invoking FileInput.__getitem__() with the current
@@ -298,7 +298,7 @@ class FileInputTests(unittest.TestCase):
with FileInput(files=[t]) as fi:
with self.assertRaises(RuntimeError) as cm:
fi[1]
- self.assertEquals(cm.exception.args, ("accessing lines out of order",))
+ self.assertEqual(cm.exception.args, ("accessing lines out of order",))
def test__getitem__eof(self):
"""Tests invoking FileInput.__getitem__() with the line number but at
@@ -308,7 +308,7 @@ class FileInputTests(unittest.TestCase):
with FileInput(files=[t]) as fi:
with self.assertRaises(IndexError) as cm:
fi[0]
- self.assertEquals(cm.exception.args, ("end of input reached",))
+ self.assertEqual(cm.exception.args, ("end of input reached",))
def test_nextfile_oserror_deleting_backup(self):
"""Tests invoking FileInput.nextfile() when the attempt to delete