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/lib/cptools.py b/cherrypy/lib/cptools.py
index 073216e0..3221066b 100644
--- a/cherrypy/lib/cptools.py
+++ b/cherrypy/lib/cptools.py
@@ -7,7 +7,7 @@ from hashlib import md5
 import six
 
 import cherrypy
-from cherrypy._cpcompat import basestring
+from cherrypy._cpcompat import text_or_bytes
 from cherrypy.lib import httputil as _httputil
 from cherrypy.lib import is_iterator
 
@@ -533,7 +533,7 @@ def accept(media=None, debug=False):
     """
     if not media:
         return
-    if isinstance(media, basestring):
+    if isinstance(media, text_or_bytes):
         media = [media]
     request = cherrypy.serving.request