summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Picon <tabo@tabo.pe>2014-04-16 01:19:54 -0400
committerGustavo Picon <tabo@tabo.pe>2014-04-16 01:19:54 -0400
commit070fa512eba2e3438a54b9e9c81860abd758b544 (patch)
tree1412496920b2ca323f6db97889219ce92a2c4119
parent2ce1e30a1fd873118f434b257c8f56f0de4b4649 (diff)
downloadcherrypy-070fa512eba2e3438a54b9e9c81860abd758b544.tar.gz
No longer using assertIsinstance (is 2.7+ only)
-rw-r--r--cherrypy/test/test_states.py2
-rw-r--r--cherrypy/test/test_tools.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cherrypy/test/test_states.py b/cherrypy/test/test_states.py
index d62f0085..d5f469ec 100644
--- a/cherrypy/test/test_states.py
+++ b/cherrypy/test/test_states.py
@@ -481,7 +481,7 @@ class WaitTests(unittest.TestCase):
with warnings.catch_warnings(record=True) as w:
servers.wait_for_occupied_port('0.0.0.0', free_port)
self.assertEqual(len(w), 1)
- self.assertIsInstance(w[0], warnings.WarningMessage)
+ self.assertTrue(isinstance(w[0], warnings.WarningMessage))
self.assertIn('Unable to verify that the server is bound on ',
str(w[0]))
diff --git a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py
index d650ca5e..6e593216 100644
--- a/cherrypy/test/test_tools.py
+++ b/cherrypy/test/test_tools.py
@@ -423,4 +423,4 @@ class SessionAuthTest(unittest.TestCase):
sa = cherrypy.lib.cptools.SessionAuth()
res = sa.login_screen(None, username=unicodestr('nobody'),
password=unicodestr('anypass'))
- self.assertIsInstance(res, bytestr)
+ self.assertTrue(isinstance(res, bytestr))