diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-09-22 16:54:15 +0300 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-09-22 16:54:15 +0300 |
| commit | dc44b0d2a9c52b5c12843cb1a0a6e0aea3c7f4d2 (patch) | |
| tree | ee090ebec55c1aa6c5b9e19bfbad1ae0bbfb8abe /sphinx/theming.py | |
| parent | 490e4aed4145659dab000e86269bd7a3dc686318 (diff) | |
| parent | b4fab4bf115af984a82b9c509decc0d1c5fe1c41 (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to 'sphinx/theming.py')
| -rw-r--r-- | sphinx/theming.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sphinx/theming.py b/sphinx/theming.py index 8a389c767..efe9673d4 100644 --- a/sphinx/theming.py +++ b/sphinx/theming.py @@ -16,7 +16,6 @@ from os import path from zipfile import ZipFile import pkg_resources -from six import iteritems from six.moves import configparser from sphinx import package_dir @@ -129,7 +128,7 @@ class Theme: except configparser.NoSectionError: pass - for option, value in iteritems(overrides): + for option, value in overrides.items(): if option not in options: logger.warning(__('unsupported theme option %r given') % option) else: @@ -174,7 +173,7 @@ class HTMLThemeFactory: # type: () -> None """Load built-in themes.""" themes = self.find_themes(path.join(package_dir, 'themes')) - for name, theme in iteritems(themes): + for name, theme in themes.items(): self.themes[name] = theme def load_additional_themes(self, theme_paths): @@ -183,7 +182,7 @@ class HTMLThemeFactory: for theme_path in theme_paths: abs_theme_path = path.abspath(path.join(self.app.confdir, theme_path)) themes = self.find_themes(abs_theme_path) - for name, theme in iteritems(themes): + for name, theme in themes.items(): self.themes[name] = theme def load_extra_theme(self, name): |