diff -r f4d1d5d9ccbb -r 90f2f20367bc web/test/unittest_views_apacherewrite.py --- a/web/test/unittest_views_apacherewrite.py Tue Jul 27 12:36:03 2010 +0200 +++ b/web/test/unittest_views_apacherewrite.py Wed Nov 03 16:38:28 2010 +0100 @@ -41,18 +41,18 @@ urlrewriter.rewrite('logilab.fr', '/whatever', req) self.fail('redirect exception expected') except Redirect, ex: - self.assertEquals(ex.location, 'http://www.logilab.fr/whatever') - self.assertEquals(urlrewriter.rewrite('www.logilab.fr', '/whatever', req), + self.assertEqual(ex.location, 'http://www.logilab.fr/whatever') + self.assertEqual(urlrewriter.rewrite('www.logilab.fr', '/whatever', req), '/whatever') - self.assertEquals(urlrewriter.rewrite('www.logilab.fr', '/json/bla', req), + self.assertEqual(urlrewriter.rewrite('www.logilab.fr', '/json/bla', req), '/json/bla') - self.assertEquals(urlrewriter.rewrite('abcd.logilab.fr', '/json/bla', req), + self.assertEqual(urlrewriter.rewrite('abcd.logilab.fr', '/json/bla', req), '/json/bla') - self.assertEquals(urlrewriter.rewrite('abcd.logilab.fr', '/data/bla', req), + self.assertEqual(urlrewriter.rewrite('abcd.logilab.fr', '/data/bla', req), '/data/bla') - self.assertEquals(urlrewriter.rewrite('abcd.logilab.fr', '/whatever', req), + self.assertEqual(urlrewriter.rewrite('abcd.logilab.fr', '/whatever', req), '/m_abcd/whatever') - self.assertEquals(urlrewriter.rewrite('abcd.fr', '/whatever', req), + self.assertEqual(urlrewriter.rewrite('abcd.fr', '/whatever', req), '/whatever')