From d2e5061136d33aeef3450738adc86205bd950809 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 15 Dec 2018 20:07:08 +0900 Subject: [PATCH] refactor: Replace six.UserString by collections.UserString --- sphinx/locale/__init__.py | 3 +-- sphinx/util/jsonimpl.py | 2 +- 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