Random cleanups

Remove some cruft from Sphinx config files, drop the use of 'u' prefixed
strings, which are unnecessary in Python 3, and generally tidy stuff up.

Change-Id: Ib0f33576e160ec842d7fc82b4fcfee99829623d7
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

1 files changed, 3 insertions, 21 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5e69e49c..515e754d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,12 +33,6 @@ apidoc_separate_modules = True
 # directive.
 autoclass_content = 'both'
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
 # The master toctree document.
 master_doc = 'index'
 
@@ -48,19 +42,6 @@ bug_project = 'python-novaclient'
 bug_tag = 'doc'
 copyright = 'OpenStack Contributors'
 
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = []
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-add_module_names = True
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -72,11 +53,12 @@ html_theme = 'openstackdocs'
 # robots.txt.
 html_extra_path = ['_extra']
 
+
 # -- Options for LaTeX output -------------------------------------------------
 
 latex_documents = [
-    ('index', 'doc-python-novaclient.tex', u'python-novaclient Documentation',
-     u'OpenStack Foundation', 'manual'),
+    ('index', 'doc-python-novaclient.tex', 'python-novaclient Documentation',
+     'OpenStack Foundation', 'manual'),
 ]
 
 latex_elements = {