Merge branch 'fix-conf-py-insert' into remove-doctype-from-search

Author: ericholscher

readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl

@@ -13,8 +13,6 @@
 # https://github.com/rtfd/readthedocs.org/blob/master/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
 #
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import importlib
 import sys
 import os.path
@@ -82,9 +80,9 @@ context = {
         ("{{ slug }}", "{{ url }}"),{% endfor %}
     ],
     'slug': '{{ project.slug }}',
-    'name': '{{ project.name }}',
-    'rtd_language': '{{ project.language }}',
-    'programming_language': '{{ project.programming_language }}',
+    'name': u'{{ project.name }}',
+    'rtd_language': u'{{ project.language }}',
+    'programming_language': u'{{ project.programming_language }}',
     'canonical_url': '{{ project.get_canonical_url }}',
     'analytics_code': '{{ project.analytics_code }}',
     'single_version': {{ project.single_version }},

readthedocs/templates/sphinx/conf.py.conf

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division, print_function, unicode_literals
-
 from datetime import datetime
 
 from recommonmark.parser import CommonMarkParser
@@ -13,7 +11,7 @@ source_parsers = {
             '.md': CommonMarkParser,
         }
 master_doc = 'index'
-project = '{{ project.name }}'
+project = u'{{ project.name }}'
 copyright = str(datetime.now().year)
 version = '{{ version.verbose_name }}'
 release = '{{ version.verbose_name }}'
@@ -24,5 +22,5 @@ html_theme = 'sphinx_rtd_theme'
 file_insertion_enabled = False
 latex_documents = [
   ('index', '{{ project.slug }}.tex', '{{ project.name }} Documentation',
-   '{{ project.copyright }}', 'manual'),
+   u'{{ project.copyright }}', 'manual'),
 ]