Index: template-remover-0.1.9/test/test_template_remover.py
===================================================================
--- template-remover-0.1.9.orig/test/test_template_remover.py
+++ template-remover-0.1.9/test/test_template_remover.py
@@ -37,7 +37,7 @@ class TestTemplateRemover(unittest.TestC
template_remover.clean_php('Link',
template_remover.clean_php('Link')
)
@@ -47,46 +47,46 @@ class TestTemplateRemover(unittest.TestC
template_remover.clean_php('Link',
template_remover.clean_php('Link')
)
def test_clean_php_short_echo(self):
- self.assertEquals(
+ self.assertEqual(
'Link',
template_remover.clean_php('Link')
)
def test_clean_php_inline_echo_mixed(self):
- self.assertEquals(
+ self.assertEqual(
' Link',
template_remover.clean_php(
' Link')
)
def test_clean_php_control(self):
- self.assertEquals(
+ self.assertEqual(
' Next',
template_remover.clean_php(
' 1) { ?>Next')
)
def test_clean_php_short_tags(self):
- self.assertEquals(
+ self.assertEqual(
'a b',
template_remover.clean_php('a ?> b')
)
def test_clean_php_control_multiline(self):
- self.assertEquals(
+ self.assertEqual(
'\n\n',
template_remover.clean_php(
' 1) { \n echo "foo"\n } ?>')
)
def test_clean_php_multiline(self):
- self.assertEquals(
+ self.assertEqual(
' Next\n' +
'Link',
template_remover.clean_php(
@@ -95,23 +95,23 @@ class TestTemplateRemover(unittest.TestC
)
def test_spaces_are_preserved(self):
- self.assertEquals(
+ self.assertEqual(
' \t\n ',
template_remover.clean_php(' \t\n ')
)
def test_php_control_at_end(self):
- self.assertEquals(
+ self.assertEqual(
' placeholder ',
template_remover.clean_php(' placeholder ')
)
def test_unicode(self):
- self.assertEquals(
+ self.assertEqual(
'ni\xf1o',
template_remover.clean_php('ni\xf1o')
)
- self.assertEquals(
+ self.assertEqual(
'\xe9',
template_remover.clean_php('\xe9')
)
@@ -135,7 +135,7 @@ class TestTemplateRemover(unittest.TestC
'''
- self.assertEquals(expected, template_remover.clean_php(template))
+ self.assertEqual(expected, template_remover.clean_php(template))
def test_jinja_comprehensive(self):
template = '''
@@ -156,12 +156,12 @@ class TestTemplateRemover(unittest.TestC
'''
- self.assertEquals(expected, template_remover.clean_jinja(template))
+ self.assertEqual(expected, template_remover.clean_jinja(template))
def test_jinja_does_not_complain_with_double_braces(self):
template = ''
expected = ''
- self.assertEquals(expected, template_remover.clean_jinja(template))
+ self.assertEqual(expected, template_remover.clean_jinja(template))
def test_mako_comprehensive(self):
template = '''
@@ -200,4 +200,4 @@ class TestTemplateRemover(unittest.TestC
'''
- self.assertEquals(expected, template_remover.clean_mako(template))
+ self.assertEqual(expected, template_remover.clean_mako(template))