clean up code formatting in some docs

fix warnings while building docs

docs/conf.py

@@ -11,13 +11,16 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 from __future__ import print_function
-import sys, os
+from datetime import datetime
+import os
+import sys
+import pkg_resources
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('_themes'))
-sys.path.append(os.path.abspath('.'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '_themes'))
+sys.path.append(os.path.dirname(__file__))
 
 # -- General configuration -----------------------------------------------------
 
@@ -46,22 +49,21 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Flask'
-copyright = u'2015, Armin Ronacher'
+copyright = u'2010 - {0}, Armin Ronacher'.format(datetime.utcnow().year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-import pkg_resources
 try:
     release = pkg_resources.get_distribution('Flask').version
 except pkg_resources.DistributionNotFound:
     print('Flask must be installed to build the documentation.')
     print('Install from source using `pip install -e .` in a virtualenv.')
     sys.exit(1)
-del pkg_resources
 
 if 'dev' in release:
-    release = release.split('dev')[0] + 'dev'
+    release = ''.join(release.partition('dev')[:2])
+
 version = '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -100,14 +102,12 @@ exclude_patterns = ['_build']
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'flask'
+# html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    'touch_icon':   'touch-icon.png'
-}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['_themes']
@@ -126,7 +126,7 @@ html_theme_path = ['_themes']
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "flask-favicon.ico"
+html_favicon = '_static/flask-favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -143,9 +143,18 @@ html_static_path = ['_static']
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
-    'index':    ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
-    '**':       ['sidebarlogo.html', 'localtoc.html', 'relations.html',
-                 'sourcelink.html', 'searchbox.html']
+    'index': [
+        'sidebarintro.html',
+        'sourcelink.html',
+        'searchbox.html'
+    ],
+    '**': [
+        'sidebarlogo.html',
+        'localtoc.html',
+        'relations.html',
+        'sourcelink.html',
+        'searchbox.html'
+    ]
 }
 
 # Additional templates that should be rendered to pages, maps page names to
@@ -187,8 +196,7 @@ htmlhelp_basename = 'Flaskdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('latexindex', 'Flask.tex', u'Flask Documentation',
-   u'Armin Ronacher', 'manual'),
+  ('latexindex', 'Flask.tex', u'Flask Documentation', u'Armin Ronacher', 'manual'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -198,10 +206,10 @@ latex_documents = [
 latex_use_modindex = False
 
 latex_elements = {
-    'fontpkg':      r'\usepackage{mathpazo}',
-    'papersize':    'a4paper',
-    'pointsize':    '12pt',
-    'preamble':     r'\usepackage{flaskstyle}'
+    'fontpkg': r'\usepackage{mathpazo}',
+    'papersize': 'a4paper',
+    'pointsize': '12pt',
+    'preamble': r'\usepackage{flaskstyle}'
 }
 latex_use_parts = True
 
@@ -245,21 +253,23 @@ latex_additional_files = ['flaskstyle.sty', 'logo.pdf']
 #epub_tocdepth = 3
 
 intersphinx_mapping = {
-    'https://docs.python.org/dev': None,
-    'http://werkzeug.pocoo.org/docs/': None,
-    'http://click.pocoo.org/': None,
-    'http://jinja.pocoo.org/docs/': None,
-    'http://www.sqlalchemy.org/docs/': None,
-    'https://wtforms.readthedocs.io/en/latest/': None,
-    'https://pythonhosted.org/blinker/': None
+    'python': ('https://docs.python.org/3/', None),
+    'werkzeug': ('http://werkzeug.pocoo.org/docs/', None),
+    'click': ('http://click.pocoo.org/', None),
+    'jinja': ('http://jinja.pocoo.org/docs/', None),
+    'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None),
+    'wtforms': ('https://wtforms.readthedocs.io/en/latest/', None),
+    'blinker': ('https://pythonhosted.org/blinker/', None)
 }
 
-pygments_style = 'flask_theme_support.FlaskyStyle'
-
-# fall back if theme is not there
 try:
     __import__('flask_theme_support')
-except ImportError as e:
+    pygments_style = 'flask_theme_support.FlaskyStyle'
+    html_theme = 'flask'
+    html_theme_options = {
+        'touch_icon': 'touch-icon.png'
+    }
+except ImportError:
     print('-' * 74)
     print('Warning: Flask themes unavailable.  Building with default theme')
     print('If you want the Flask themes, run this command and build again:')
@@ -267,10 +277,6 @@ except ImportError as e:
     print('  git submodule update --init')
     print('-' * 74)
 
-    pygments_style = 'tango'
-    html_theme = 'default'
-    html_theme_options = {}
-
 
 # unwrap decorators
 def unwrap_decorators():