Automated merge with https://www.knowledgetap.com/hg/routes

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/test_functional/test_generation.py b/tests/test_functional/test_generation.py
index 60a7ae2..e4a938c 100644
--- a/tests/test_functional/test_generation.py
+++ b/tests/test_functional/test_generation.py
@@ -577,7 +577,7 @@ class TestGeneration(unittest.TestCase):
         m = Mapper()
         m.connect(':hoge')
         self.assertEqual("/%s" % hoge_enc, m.generate(hoge=hoge))
-        self.assertTrue(isinstance(m.generate(hoge=hoge), str))
+        self.assert_(isinstance(m.generate(hoge=hoge), str))
 
     def test_unicode_static(self):
         hoge = u'\u30c6\u30b9\u30c8' # the word test in Japanese
@@ -586,7 +586,7 @@ class TestGeneration(unittest.TestCase):
         m.connect('google-jp', 'http://www.google.co.jp/search', _static=True)
         self.assertEqual("http://www.google.co.jp/search?q=" + hoge_enc,
                          url_for('google-jp', q=hoge))
-        self.assertTrue(isinstance(url_for('google-jp', q=hoge), str))
+        self.assert_(isinstance(url_for('google-jp', q=hoge), str))
 
     def test_other_special_chars(self):
         m = Mapper()