Fixes #748: clean up deprecation and resource warnings in the test suite when run with python3 -Wd.

1 files changed, 26 insertions, 27 deletions

diff --git a/tests/test_util.py b/tests/test_util.py
index d994e5fa..6b931eb2 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -8,7 +8,6 @@
 """
 
 import unittest
-import os
 
 from pygments import util
 
@@ -23,7 +22,7 @@ class UtilTest(unittest.TestCase):
 
     def test_getoptions(self):
         raises = self.assertRaises
-        equals = self.assertEquals
+        equals = self.assertEqual
 
         equals(util.get_bool_opt({}, 'a', True), True)
         equals(util.get_bool_opt({}, 'a', 1), True)
@@ -56,20 +55,20 @@ class UtilTest(unittest.TestCase):
             other text
             """
 
-        self.assertEquals(util.docstring_headline(f1), "docstring headline")
-        self.assertEquals(util.docstring_headline(f2), "docstring headline")
+        self.assertEqual(util.docstring_headline(f1), "docstring headline")
+        self.assertEqual(util.docstring_headline(f2), "docstring headline")
 
     def test_analysator_returns_float(self):
         # If an analysator wrapped by make_analysator returns a floating point
         # number, then that number will be returned by the wrapper.
-        self.assertEquals(FakeLexer.analyse('0.5'), 0.5)
+        self.assertEqual(FakeLexer.analyse('0.5'), 0.5)
 
     def test_analysator_returns_boolean(self):
         # If an analysator wrapped by make_analysator returns a boolean value,
         # then the wrapper will return 1.0 if the boolean was True or 0.0 if
         # it was False.
-        self.assertEquals(FakeLexer.analyse(True), 1.0)
-        self.assertEquals(FakeLexer.analyse(False), 0.0)
+        self.assertEqual(FakeLexer.analyse(True), 1.0)
+        self.assertEqual(FakeLexer.analyse(False), 0.0)
 
     def test_analysator_raises_exception(self):
         # If an analysator wrapped by make_analysator raises an exception,
@@ -78,40 +77,40 @@ class UtilTest(unittest.TestCase):
             def analyse(text):
                 raise RuntimeError('something bad happened')
             analyse = util.make_analysator(analyse)
-        self.assertEquals(ErrorLexer.analyse(''), 0.0)
+        self.assertEqual(ErrorLexer.analyse(''), 0.0)
 
     def test_analysator_value_error(self):
         # When converting the analysator's return value to a float a
         # ValueError may occur.  If that happens 0.0 is returned instead.
-        self.assertEquals(FakeLexer.analyse('bad input'), 0.0)
+        self.assertEqual(FakeLexer.analyse('bad input'), 0.0)
 
     def test_analysator_type_error(self):
         # When converting the analysator's return value to a float a
         # TypeError may occur.  If that happens 0.0 is returned instead.
-        self.assertEquals(FakeLexer.analyse(None), 0.0)
+        self.assertEqual(FakeLexer.analyse(None), 0.0)
 
     def test_shebang_matches(self):
-        self.assert_(util.shebang_matches('#!/usr/bin/env python', r'python(2\.\d)?'))
-        self.assert_(util.shebang_matches('#!/usr/bin/python2.4', r'python(2\.\d)?'))
-        self.assert_(util.shebang_matches('#!/usr/bin/startsomethingwith python',
-                                          r'python(2\.\d)?'))
-        self.assert_(util.shebang_matches('#!C:\\Python2.4\\Python.exe',
-                                          r'python(2\.\d)?'))
+        self.assertTrue(util.shebang_matches('#!/usr/bin/env python', r'python(2\.\d)?'))
+        self.assertTrue(util.shebang_matches('#!/usr/bin/python2.4', r'python(2\.\d)?'))
+        self.assertTrue(util.shebang_matches('#!/usr/bin/startsomethingwith python',
+                                             r'python(2\.\d)?'))
+        self.assertTrue(util.shebang_matches('#!C:\\Python2.4\\Python.exe',
+                                             r'python(2\.\d)?'))
 
-        self.failIf(util.shebang_matches('#!/usr/bin/python-ruby', r'python(2\.\d)?'))
-        self.failIf(util.shebang_matches('#!/usr/bin/python/ruby', r'python(2\.\d)?'))
-        self.failIf(util.shebang_matches('#!', r'python'))
+        self.assertFalse(util.shebang_matches('#!/usr/bin/python-ruby', r'python(2\.\d)?'))
+        self.assertFalse(util.shebang_matches('#!/usr/bin/python/ruby', r'python(2\.\d)?'))
+        self.assertFalse(util.shebang_matches('#!', r'python'))
 
     def test_doctype_matches(self):
-        self.assert_(util.doctype_matches('<!DOCTYPE html PUBLIC "a"> <html>',
-                                          'html.*'))
-        self.failIf(util.doctype_matches('<?xml ?> <DOCTYPE html PUBLIC "a"> <html>',
-                                         'html.*'))
-        self.assert_(util.html_doctype_matches(
+        self.assertTrue(util.doctype_matches(
+            '<!DOCTYPE html PUBLIC "a"> <html>', 'html.*'))
+        self.assertFalse(util.doctype_matches(
+            '<?xml ?> <DOCTYPE html PUBLIC "a"> <html>', 'html.*'))
+        self.assertTrue(util.html_doctype_matches(
             '<?xml ?><!DOCTYPE html PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN">'))
 
     def test_xml(self):
-        self.assert_(util.looks_like_xml(
+        self.assertTrue(util.looks_like_xml(
             '<?xml ?><!DOCTYPE html PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN">'))
-        self.assert_(util.looks_like_xml('<html xmlns>abc</html>'))
-        self.failIf(util.looks_like_xml('<html>'))
+        self.assertTrue(util.looks_like_xml('<html xmlns>abc</html>'))
+        self.assertFalse(util.looks_like_xml('<html>'))