summaryrefslogtreecommitdiff
path: root/sphinx/util/jsdump.py
diff options
context:
space:
mode:
Diffstat (limited to 'sphinx/util/jsdump.py')
-rw-r--r--sphinx/util/jsdump.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/sphinx/util/jsdump.py b/sphinx/util/jsdump.py
index e75f9f848..ede4ae7da 100644
--- a/sphinx/util/jsdump.py
+++ b/sphinx/util/jsdump.py
@@ -12,8 +12,7 @@
import re
-import six
-from six import iteritems, integer_types
+from six import iteritems, integer_types, string_types
from sphinx.util.pycompat import u
@@ -77,7 +76,7 @@ double in super""".split())
def dumps(obj, key=False):
if key:
- if not isinstance(obj, six.string_types):
+ if not isinstance(obj, string_types):
obj = str(obj)
if _nameonly_re.match(obj) and obj not in reswords:
return obj # return it as a bare word
@@ -96,7 +95,7 @@ def dumps(obj, key=False):
) for key, value in iteritems(obj))
elif isinstance(obj, (tuple, list, set)):
return '[%s]' % ','.join(dumps(x) for x in obj)
- elif isinstance(obj, six.string_types):
+ elif isinstance(obj, string_types):
return encode_string(obj)
raise TypeError(type(obj))