diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2020-09-08 20:33:25 +0200 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2020-09-08 20:33:25 +0200 |
| commit | 203ef1eff6daebab6f95b0b49e6e6a58168073fb (patch) | |
| tree | 7defa199f48a34787f980b6400d8bbaa9380039a /pygments/lexer.py | |
| parent | e09d4e0cf23d7c6069ddc690942ceb4cd23fd556 (diff) | |
| parent | b2c91c70ee536b0472100d1273818f8bb45529fe (diff) | |
| download | pygments-git-bug/angular-html.tar.gz | |
Merge branch 'master' into bug/angular-htmlbug/angular-html
# Conflicts:
# tests/test_shell.py
Diffstat (limited to 'pygments/lexer.py')
| -rw-r--r-- | pygments/lexer.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pygments/lexer.py b/pygments/lexer.py index 62439b10..920fc972 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -166,11 +166,11 @@ class Lexer(metaclass=LexerMeta): text = decoded else: text = text.decode(self.encoding) - if text.startswith(u'\ufeff'): - text = text[len(u'\ufeff'):] + if text.startswith('\ufeff'): + text = text[len('\ufeff'):] else: - if text.startswith(u'\ufeff'): - text = text[len(u'\ufeff'):] + if text.startswith('\ufeff'): + text = text[len('\ufeff'):] # text now *is* a unicode string text = text.replace('\r\n', '\n') @@ -663,7 +663,7 @@ class RegexLexer(Lexer, metaclass=RegexLexerMeta): # at EOL, reset state to "root" statestack = ['root'] statetokens = tokendefs['root'] - yield pos, Text, u'\n' + yield pos, Text, '\n' pos += 1 continue yield pos, Error, text[pos] @@ -751,7 +751,7 @@ class ExtendedRegexLexer(RegexLexer): # at EOL, reset state to "root" ctx.stack = ['root'] statetokens = tokendefs['root'] - yield ctx.pos, Text, u'\n' + yield ctx.pos, Text, '\n' ctx.pos += 1 continue yield ctx.pos, Error, text[ctx.pos] |