Skip to content

Commit 74187ab

Browse files
committed
start support for spinx 1.7 or 1.6
1 parent 9cf6649 commit 74187ab

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

.coveralls.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repo_token: niCbipldEa8bIbuYwWyJqo7082UOtku0w

ablog/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
generate_archive_pages, generate_atom_feeds,
99
missing_reference)
1010

11-
__version__ = '0.8.5'
11+
__version__ = '0.9.0'
1212

1313

1414
def anchor(post):

ablog/start.py

+16-9
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,30 @@
44
import time
55
import datetime
66

7+
from distutils.version import LooseVersion
78
from os import path
89
from io import open
910
from docutils.utils import column_width
11+
from textwrap import wrap
1012

11-
if sys.version_info >= (3, 0):
12-
text_type = str
13-
else:
14-
text_type = unicode
15-
16-
17-
from ablog import __version__
13+
from sphinx import __version__
1814
from sphinx.util import texescape
19-
from sphinx.quickstart import do_prompt, is_path, ensuredir
2015
from sphinx.util.console import bold, nocolor, color_terminal
2116
from sphinx.util.osutil import make_filename
2217

23-
from textwrap import wrap
18+
SPHINX_LT_17 = LooseVersion(__version__) < LooseVersion('1.7')
19+
20+
if SPHINX_LT_17:
21+
from sphinx.quickstart import do_prompt, is_path, ensuredir
22+
else:
23+
from sphinx.cmd.quickstart import do_prompt, is_path, ensuredir
24+
25+
from ablog import __version__
26+
27+
if sys.version_info >= (3, 0):
28+
text_type = str
29+
else:
30+
text_type = unicode
2431

2532
w = lambda t, ls=80: '\n'.join(wrap(t, ls))
2633

0 commit comments

Comments
 (0)