diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
| commit | 279e547860ea68e3c357f55e608afec682a1f961 (patch) | |
| tree | dc08e85ab0210538e30b5b801bf9d80ab49bfb3f /sphinx/util/rst.py | |
| parent | 859b5fcea71f8d4f46e0ef3726e68df54bfbc3b7 (diff) | |
| parent | 64fb1e56242d93ee0e8c317ab9e7643242b99658 (diff) | |
| download | sphinx-git-279e547860ea68e3c357f55e608afec682a1f961.tar.gz | |
Merge branch '3.x'
Diffstat (limited to 'sphinx/util/rst.py')
| -rw-r--r-- | sphinx/util/rst.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sphinx/util/rst.py b/sphinx/util/rst.py index e93849b70..b67b68c4a 100644 --- a/sphinx/util/rst.py +++ b/sphinx/util/rst.py @@ -18,12 +18,10 @@ from docutils.parsers.rst import roles from docutils.parsers.rst.languages import en as english from docutils.statemachine import StringList from docutils.utils import Reporter -from jinja2 import Environment -from jinja2 import environmentfilter +from jinja2 import Environment, environmentfilter from sphinx.locale import __ -from sphinx.util import docutils -from sphinx.util import logging +from sphinx.util import docutils, logging logger = logging.getLogger(__name__) |