mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-30 17:43:42 +00:00
ae18d68b6b
Another step in further separating python2 from python3.
23 lines
1005 B
Diff
23 lines
1005 B
Diff
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
|
|
index ac2bd1b06..63ca52de2 100644
|
|
--- a/sphinx/highlighting.py
|
|
+++ b/sphinx/highlighting.py
|
|
@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken
|
|
from pygments.formatters import HtmlFormatter, LatexFormatter
|
|
from pygments.lexer import Lexer # NOQA
|
|
from pygments.lexers import get_lexer_by_name, guess_lexer
|
|
-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
|
|
+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \
|
|
CLexer, TextLexer, RstLexer
|
|
from pygments.styles import get_style_by_name
|
|
from pygments.util import ClassNotFound
|
|
@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
|
|
|
|
lexers = dict(
|
|
none = TextLexer(stripnl=False),
|
|
- python = PythonLexer(stripnl=False),
|
|
+ python = Python2Lexer(stripnl=False),
|
|
python3 = Python3Lexer(stripnl=False),
|
|
pycon = PythonConsoleLexer(stripnl=False),
|
|
pycon3 = PythonConsoleLexer(python3=True, stripnl=False),
|