summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2018-12-15 20:07:08 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2018-12-15 20:07:08 +0900
commitd2e5061136d33aeef3450738adc86205bd950809 (patch)
tree9d1b17f34f048fa407ec107ded90d376a6b5018c
parentaaf0046f441aab454c64c792291dd87867fd0699 (diff)
downloadsphinx-git-d2e5061136d33aeef3450738adc86205bd950809.tar.gz
refactor: Replace six.UserString by collections.UserString
-rw-r--r--sphinx/locale/__init__.py3
-rw-r--r--sphinx/util/jsonimpl.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
index e10bcfdf4..aa962392b 100644
--- a/sphinx/locale/__init__.py
+++ b/sphinx/locale/__init__.py
@@ -12,11 +12,10 @@
import gettext
import locale
import warnings
-from collections import defaultdict
+from collections import UserString, defaultdict
from gettext import NullTranslations
from six import text_type
-from six.moves import UserString
from sphinx.deprecation import RemovedInSphinx30Warning
diff --git a/sphinx/util/jsonimpl.py b/sphinx/util/jsonimpl.py
index 557bc122f..b06d32b91 100644
--- a/sphinx/util/jsonimpl.py
+++ b/sphinx/util/jsonimpl.py
@@ -10,9 +10,9 @@
"""
import json
+from collections import UserString
from six import text_type
-from six.moves import UserString
if False:
# For type annotation