diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-25 21:36:30 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-25 21:36:30 +0100 |
| commit | f01d50d695bf55f1af34b87c4e6c84f76dd9a36d (patch) | |
| tree | e98dc537312410d5661ae76c72306d3a8d2a8e49 /sphinx/highlighting.py | |
| parent | 7ad0fcf22dbff5ee80a644e46429ff2ec3f25980 (diff) | |
| parent | eb5b3aa25dbc918c8250a2336aaaf2b753ad36b5 (diff) | |
| download | sphinx-git-f01d50d695bf55f1af34b87c4e6c84f76dd9a36d.tar.gz | |
Merge branch '5.x'
# Conflicts:
# CHANGES
# doc/conf.py
# sphinx/__init__.py
# sphinx/builders/html/__init__.py
# sphinx/domains/python.py
# tests/test_build_html.py
Diffstat (limited to 'sphinx/highlighting.py')
| -rw-r--r-- | sphinx/highlighting.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py index 4a737eb40..7716f2a12 100644 --- a/sphinx/highlighting.py +++ b/sphinx/highlighting.py @@ -120,6 +120,8 @@ class PygmentsBridge: lang = 'pycon' else: lang = 'python' + if lang == 'pycon3': + lang = 'pycon' if lang in lexers: # just return custom lexers here (without installing raiseonerror filter) |