more updatees for 1.7

Author: nabobalis

.pep8speaks.yml

@@ -0,0 +1,9 @@
+pycodestyle:
+  max-line-length: 120 # Default is 79 in PEP8
+  exclude:
+    - setup.py
+    - ez_setup.py
+    - ah_bootstrap.py
+    - astropy_helpers/
+    - docs/conf.py
+  descending_issues_order: True

ablog/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """ABlog for Sphinx"""
+
+from __future__ import absolute_import, division, print_function
 import os
 
 from .blog import Blog, CONFIG

ablog/blog.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """Classes for handling posts and archives."""
 
+from __future__ import absolute_import, division, print_function
 import os
 import re
 import sys

ablog/commands.py

@@ -1,13 +1,17 @@
+from __future__ import absolute_import, division, print_function
 import os
 import sys
 import glob
 import ablog
 import shutil
 import argparse
+from distutils.version import LooseVersion
+
+from sphinx import __version__
 
 BUILDDIR = '_website'
 DOCTREES = '.doctrees'
-
+SPHINX_LT_17 = LooseVersion(__version__) < LooseVersion('1.7')
 
 def find_confdir():
     """Return path to current directory or its parent that contains conf.py"""
@@ -139,7 +143,6 @@ def arg_doctrees(func):
 def ablog_build(builder=None, sourcedir=None, website=None, doctrees=None,
                 traceback=False, runpdb=False, allfiles=False, werror=False, verbosity=0,
                 quiet=False, extra_quiet=False, no_colors=False, **kwargs):
-
     confdir = find_confdir()
     conf = read_conf(confdir)
     website = (website or
@@ -168,8 +171,14 @@ def ablog_build(builder=None, sourcedir=None, website=None, doctrees=None,
         argv.extend(['-N'])
     argv.extend([sourcedir, website])
 
-    from sphinx import main
-    main(argv)
+    if SPHINX_LT_17:
+        from sphinx import main
+        main(argv)
+    else:
+        from sphinx.cmd.build import main
+        # srcdir, confdir, outdir, doctreedir, buildername is the order now
+        argv = []
+        main(argv)
 
 
 @arg('-D', dest='deep', action='store_true', default=False,

ablog/post.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """post and postlist directives."""
 
+from __future__ import absolute_import, division, print_function
 import os
 import sys
 from string import Formatter

ablog/start.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, print_function
 import sys
 import time
 import datetime
@@ -559,7 +559,10 @@ def ask_user(d):
         print(bold('Selected root path: %s' % d['path']))
     else:
         print('Enter the root path for your blog project.')
-        do_prompt(d, 'path', 'Root path for your project', '.', is_path)
+        if SPHINX_LT_17:
+            do_prompt(d, 'path', 'Root path for your project', '.', is_path)
+        else:
+            d['path'] = do_prompt('Root path for your project', '.', is_path)
 
     while path.isfile(path.join(d['path'], 'conf.py')) or \
             path.isfile(path.join(d['path'], 'source', 'conf.py')):
@@ -568,8 +571,10 @@ def ask_user(d):
                      'selected root path.')))
         print('ablog start will not overwrite existing Sphinx projects.')
         print('')
-        do_prompt(d, 'path',
-                  'Please enter a new root path (or just Enter to exit)', '', is_path)
+        if SPHINX_LT_17:
+            do_prompt(d, 'path','Please enter a new root path (or just Enter to exit)', '', is_path)
+        else:
+            d['path'] = do_prompt('Please enter a new root path (or just Enter to exit)', '', is_path)
         if not d['path']:
             sys.exit(1)
 
@@ -579,14 +584,20 @@ def ask_user(d):
                 'including blog archive pages and atom feeds. Later, you can '
                 'set separate names for different parts of the website in '
                 'configuration file.'))
-        do_prompt(d, 'project', 'Project name')
+        if SPHINX_LT_17:
+            do_prompt(d, 'project', 'Project name')
+        else:
+            d['project'] = do_prompt('Project name')
 
     if 'author' not in d:
         print(w('This of author as the copyright holder of the content. '
                 'If your blog has multiple authors, you might want to enter '
                 'a team name here. Later, you can specify individual authors '
                 'using `blog_authors` configuration option.'))
-        do_prompt(d, 'author', 'Author name(s)')
+        if SPHINX_LT_17:
+            do_prompt(d, 'author', 'Author name(s)')
+        else:
+            d['author'] = do_prompt('Author name(s)')
 
     d['release'] = d['version'] = ''
 
@@ -597,16 +608,22 @@ def ask_user(d):
                      'selected root path.' % (d['master'] + d['suffix']))))
         print('ablog-start will not overwrite the existing file.')
         print('')
-        do_prompt(d, 'master', w('Please enter a new file name, or rename the '
-                                 'existing file and press Enter'), d['master'])
+        if SPHINX_LT_17:
+            do_prompt(d, 'master', w('Please enter a new file name, or rename the '
+                      'existing file and press Enter'), d['master'])
+        else:
+            d['master'] = do_prompt(w('Please enter a new file name, or rename the '
+                                    'existing file and press Enter'), d['master'])
 
     if 'blog_baseurl' not in d:
         print('')
         print(w('Please enter the base URL for your project. Blog feeds will '
                 'be generated relative to this URL. If you don\'t have one yet, '
                 'you can set it in configuration file later.'))
-        do_prompt(d, 'blog_baseurl', 'Base URL for your project',
-                  None, lambda x: True)
+        if SPHINX_LT_17:
+            do_prompt(d, 'blog_baseurl', 'Base URL for your project', None, lambda x: True)
+        else:
+            d['blog_baseurl'] = do_prompt('Base URL for your project', None, lambda x: True)
 
     print('')
 

docs/conf.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
 import os
 import sys