summaryrefslogtreecommitdiff
path: root/sphinx/util/jsonimpl.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2018-12-26 01:31:33 +0900
committerGitHub <noreply@github.com>2018-12-26 01:31:33 +0900
commit99a7dca2160996e3189dfcc2176bbbbac531d5f3 (patch)
tree6924a65a62f2191e2f7fe30d3af9ac9da2ca4c48 /sphinx/util/jsonimpl.py
parentf811e4cea696d1dd724f61fb7226b5187b69fac9 (diff)
parent6978918ffc14b0b096285adfa0c90f95de281efa (diff)
downloadsphinx-git-99a7dca2160996e3189dfcc2176bbbbac531d5f3.tar.gz
Merge pull request #5806 from jdufresne/six-text-type
Replace use of six.text_type with str
Diffstat (limited to 'sphinx/util/jsonimpl.py')
-rw-r--r--sphinx/util/jsonimpl.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/sphinx/util/jsonimpl.py b/sphinx/util/jsonimpl.py
index eb4117f90..8054be0d7 100644
--- a/sphinx/util/jsonimpl.py
+++ b/sphinx/util/jsonimpl.py
@@ -11,8 +11,6 @@
import json
from collections import UserString
-from six import text_type
-
if False:
# For type annotation
from typing import Any, IO # NOQA
@@ -23,7 +21,7 @@ class SphinxJSONEncoder(json.JSONEncoder):
def default(self, obj):
# type: (Any) -> str
if isinstance(obj, UserString):
- return text_type(obj)
+ return str(obj)
return super().default(obj)