Skip to content

Commit 06b07cc

Browse files
committed
Make our generated conf.py compatible with Py2 and Py3
1 parent 507d8a0 commit 06b07cc

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# https://github.com/rtfd/readthedocs.org/blob/master/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
1414
#
1515

16+
from __future__ import absolute_import, division, print_function, unicode_literals
1617

1718
import importlib
1819
import sys
@@ -81,9 +82,9 @@ context = {
8182
("{{ slug }}", "{{ url }}"),{% endfor %}
8283
],
8384
'slug': '{{ project.slug }}',
84-
'name': u'{{ project.name }}',
85-
'rtd_language': u'{{ project.language }}',
86-
'programming_language': u'{{ project.programming_language }}',
85+
'name': '{{ project.name }}',
86+
'rtd_language': '{{ project.language }}',
87+
'programming_language': '{{ project.programming_language }}',
8788
'canonical_url': '{{ project.get_canonical_url }}',
8889
'analytics_code': '{{ project.analytics_code }}',
8990
'single_version': {{ project.single_version }},

readthedocs/rtd_tests/files/conf.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22

33
from __future__ import division, print_function, unicode_literals
4+
45
from datetime import datetime
56

67
from recommonmark.parser import CommonMarkParser
@@ -12,7 +13,7 @@
1213
'.md': CommonMarkParser,
1314
}
1415
master_doc = 'index'
15-
project = u'Pip'
16+
project = 'Pip'
1617
copyright = str(datetime.now().year)
1718
version = '0.8.1'
1819
release = '0.8.1'

readthedocs/templates/sphinx/conf.py.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ source_parsers = {
1313
'.md': CommonMarkParser,
1414
}
1515
master_doc = 'index'
16-
project = u'{{ project.name }}'
16+
project = '{{ project.name }}'
1717
copyright = str(datetime.now().year)
1818
version = '{{ version.verbose_name }}'
1919
release = '{{ version.verbose_name }}'
@@ -23,6 +23,6 @@ htmlhelp_basename = '{{ project.slug }}'
2323
html_theme = 'sphinx_rtd_theme'
2424
file_insertion_enabled = False
2525
latex_documents = [
26-
('index', '{{ project.slug }}.tex', u'{{ project.name }} Documentation',
27-
u'{{ project.copyright }}', 'manual'),
26+
('index', '{{ project.slug }}.tex', '{{ project.name }} Documentation',
27+
'{{ project.copyright }}', 'manual'),
2828
]

0 commit comments

Comments
 (0)