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/formatters/other.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/formatters/other.py')
-rw-r--r-- | pygments/formatters/other.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pygments/formatters/other.py b/pygments/formatters/other.py index 9f8bab4b..a86e81e0 100644 --- a/pygments/formatters/other.py +++ b/pygments/formatters/other.py @@ -119,12 +119,12 @@ class RawTokenFormatter(Formatter): flush() -TESTCASE_BEFORE = u'''\ +TESTCASE_BEFORE = '''\ def testNeedsName(lexer): fragment = %r tokens = [ ''' -TESTCASE_AFTER = u'''\ +TESTCASE_AFTER = '''\ ] assert list(lexer.get_tokens(fragment)) == tokens ''' @@ -152,8 +152,8 @@ class TestcaseFormatter(Formatter): rawbuf.append(value) outbuf.append('%s(%s, %r),\n' % (indentation, ttype, value)) - before = TESTCASE_BEFORE % (u''.join(rawbuf),) - during = u''.join(outbuf) + before = TESTCASE_BEFORE % (''.join(rawbuf),) + during = ''.join(outbuf) after = TESTCASE_AFTER if self.encoding is None: outfile.write(before + during + after) |