Closes #980: fix DeprecationWarnings (mostly due to files closed by __del__) on Py3.

Also fix a bunch of other uses of open() to use the with statement.

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/test_util.py b/tests/test_util.py
index 6aee2c26..7bf03409 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -123,7 +123,7 @@ class UtilTest(unittest.TestCase):
         r = re.compile(util.unirange(0x10000, 0x20000))
         m = r.match(first_non_bmp)
         self.assertTrue(m)
-        self.assertEquals(m.end(), len(first_non_bmp))
+        self.assertEqual(m.end(), len(first_non_bmp))
         self.assertFalse(r.match(u'\uffff'))
         self.assertFalse(r.match(u'xxx'))
         # Tests that end is inclusive
@@ -132,7 +132,7 @@ class UtilTest(unittest.TestCase):
         # build
         m = r.match(first_non_bmp * 2)
         self.assertTrue(m)
-        self.assertEquals(m.end(), len(first_non_bmp) * 2)
+        self.assertEqual(m.end(), len(first_non_bmp) * 2)
 
     def test_format_lines(self):
         lst = ['cat', 'dog']
@@ -140,4 +140,4 @@ class UtilTest(unittest.TestCase):
         d = {}
         exec(output, d)
         self.assertTrue(isinstance(d['var'], tuple))
-        self.assertEquals(('cat', 'dog'), d['var'])
+        self.assertEqual(('cat', 'dog'), d['var'])