summaryrefslogtreecommitdiff
path: root/tests/test_asm.py
diff options
context:
space:
mode:
authorMatthäus G. Chajdas <dev@anteru.net>2020-09-08 20:33:25 +0200
committerMatthäus G. Chajdas <dev@anteru.net>2020-09-08 20:33:25 +0200
commit203ef1eff6daebab6f95b0b49e6e6a58168073fb (patch)
tree7defa199f48a34787f980b6400d8bbaa9380039a /tests/test_asm.py
parente09d4e0cf23d7c6069ddc690942ceb4cd23fd556 (diff)
parentb2c91c70ee536b0472100d1273818f8bb45529fe (diff)
downloadpygments-git-bug/angular-html.tar.gz
Merge branch 'master' into bug/angular-htmlbug/angular-html
# Conflicts: # tests/test_shell.py
Diffstat (limited to 'tests/test_asm.py')
-rw-r--r--tests/test_asm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_asm.py b/tests/test_asm.py
index d351ce30..23e9f344 100644
--- a/tests/test_asm.py
+++ b/tests/test_asm.py
@@ -62,7 +62,7 @@ def test_cpuid(lexer_nasm):
# cpu id, but as a single token. See bug #1517
fragment = 'cpuid'
expected = [
- (Token.Name.Function, u'cpuid'),
- (Token.Text, u'\n'),
+ (Token.Name.Function, 'cpuid'),
+ (Token.Text, '\n'),
]
assert expected == list(lexer_nasm.get_tokens(fragment))