py3k: replace "file(path)" with "open(path)"

2 files changed, 6 insertions, 6 deletions

diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index 3a12159..28b45f1 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -189,10 +189,10 @@ class TestlibTC(TestCase):
     def test_stream_equality(self):
         foo = join(dirname(__file__), 'data', 'foo.txt')
         spam = join(dirname(__file__), 'data', 'spam.txt')
-        stream1 = file(foo)
+        stream1 = open(foo)
         self.tc.assertStreamEqual(stream1, stream1)
-        stream1 = file(foo)
-        stream2 = file(spam)
+        stream1 = open(foo)
+        stream2 = open(spam)
         self.assertRaises(AssertionError, self.tc.assertStreamEqual, stream1, stream2)
 
     def test_text_equality(self):
@@ -210,10 +210,10 @@ class TestlibTC(TestCase):
         self.assertRaises(AssertionError, self.tc.assertMultiLineEqual, 'toto\ntiti', 'toto\n titi\n')
         foo = join(dirname(__file__), 'data', 'foo.txt')
         spam = join(dirname(__file__), 'data', 'spam.txt')
-        text1 = file(foo).read()
+        text1 = open(foo).read()
         self.tc.assertMultiLineEqual(text1, text1)
         self.tc.assertMultiLineEqual(text1, text1)
-        text2 = file(spam).read()
+        text2 = open(spam).read()
         self.assertRaises(AssertionError, self.tc.assertMultiLineEqual, text1, text2)
         self.assertRaises(AssertionError, self.tc.assertMultiLineEqual, text1, text2)
 
diff --git a/testlib.py b/testlib.py
index 62fd36b..7fab1f6 100644
--- a/testlib.py
+++ b/testlib.py
@@ -886,7 +886,7 @@ succeeded test into", osp.join(os.getcwd(), FILE_RESTART)
     @deprecated('Non-standard: please copy test method to your TestCase class')
     def assertFileEquals(self, fname1, fname2, junk=(' ', '\t')):
         """compares two files using difflib"""
-        self.assertStreamEqual(file(fname1), file(fname2), junk,
+        self.assertStreamEqual(open(fname1), open(fname2), junk,
             msg_prefix='Files differs\n-:%s\n+:%s\n'%(fname1, fname2))
 
     assertFileEqual = assertFileEquals