Skip to content

Commit eac326a

Browse files
committed
Merge remote-tracking branch 'upstream/3.8' into 3.8
2 parents e2b6c88 + 0e5f4b6 commit eac326a

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

conf.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,16 @@
6969
_stdauthor, 'manual'),
7070
]
7171

72-
extensions.extend([
73-
'sphinx_tabs.tabs',
74-
'sphinxemoji.sphinxemoji',
75-
])
72+
try:
73+
extensions.extend([
74+
'sphinx_tabs.tabs',
75+
'sphinxemoji.sphinxemoji',
76+
])
77+
except NameError:
78+
extensions = [
79+
'sphinx_tabs.tabs',
80+
'sphinxemoji.sphinxemoji',
81+
]
7682

7783

7884
def setup(app):

0 commit comments

Comments
 (0)