Merge branch 'master' into bug/angular-htmlbug/angular-html

# Conflicts:
#	tests/test_shell.py

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/test_cpp.py b/tests/test_cpp.py
index a3ef33a3..e847079d 100644
--- a/tests/test_cpp.py
+++ b/tests/test_cpp.py
@@ -21,18 +21,18 @@ def lexer():
 
 
 def test_good_comment(lexer):
-    fragment = u'/* foo */\n'
+    fragment = '/* foo */\n'
     tokens = [
-        (Token.Comment.Multiline, u'/* foo */'),
-        (Token.Text, u'\n'),
+        (Token.Comment.Multiline, '/* foo */'),
+        (Token.Text, '\n'),
     ]
     assert list(lexer.get_tokens(fragment)) == tokens
 
 
 def test_open_comment(lexer):
-    fragment = u'/* foo\n'
+    fragment = '/* foo\n'
     tokens = [
-        (Token.Comment.Multiline, u'/* foo\n'),
+        (Token.Comment.Multiline, '/* foo\n'),
     ]
     assert list(lexer.get_tokens(fragment)) == tokens
 
@@ -52,4 +52,4 @@ def test_guess_c_lexer():
     }
     '''
     lexer = guess_lexer(code)
-    assert isinstance(lexer, CLexer)
\ No newline at end of file
+    assert isinstance(lexer, CLexer)