Use the preferred name text_or_bytes to avoid conflation with 'basestring' which has no equivalent on Python 3.

1 files changed, 2 insertions, 2 deletions

diff --git a/cherrypy/test/logtest.py b/cherrypy/test/logtest.py
index 53f29f11..27feac86 100644
--- a/cherrypy/test/logtest.py
+++ b/cherrypy/test/logtest.py
@@ -5,7 +5,7 @@ import time
 
 import six
 
-from cherrypy._cpcompat import basestring, ntob
+from cherrypy._cpcompat import text_or_bytes, ntob
 
 
 try:
@@ -187,7 +187,7 @@ class LogCase(object):
             # Multiple args. Use __getslice__ and require lines to be list.
             if isinstance(lines, tuple):
                 lines = list(lines)
-            elif isinstance(lines, basestring):
+            elif isinstance(lines, text_or_bytes):
                 raise TypeError("The 'lines' arg must be a list when "
                                 "'sliceargs' is a tuple.")