diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2016-01-24 13:47:51 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2016-01-24 13:47:51 +0900 |
| commit | b1a23817fc6e880fb7ed6c5e873f70bf65e2272b (patch) | |
| tree | bc7fde90108744cc29e2397740530a699f5de02e /sphinx/theming.py | |
| parent | 97db21453b41447b2e4613eb2fe77391cf9e00a5 (diff) | |
| parent | 6ef4bd3e1e5e1fef43642d6dc47ca5ecc785942f (diff) | |
| download | sphinx-git-b1a23817fc6e880fb7ed6c5e873f70bf65e2272b.tar.gz | |
Merge with 'stable'
Diffstat (limited to 'sphinx/theming.py')
| -rw-r--r-- | sphinx/theming.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sphinx/theming.py b/sphinx/theming.py index 7c53479ca..08051be98 100644 --- a/sphinx/theming.py +++ b/sphinx/theming.py @@ -26,8 +26,6 @@ except ImportError: from sphinx import package_dir from sphinx.errors import ThemeError -import alabaster - NODEFAULT = object() THEMECONF = 'theme.conf' @@ -78,6 +76,7 @@ class Theme(object): pass if name in themes: if name == 'alabaster': + import alabaster themedir = alabaster.get_path() # alabaster theme also requires 'alabaster' extension, it will be loaded # at sphinx.application module. |