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

# Conflicts:
#	tests/test_shell.py

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/test_qbasiclexer.py b/tests/test_qbasiclexer.py
index fb721437..83077e7e 100644
--- a/tests/test_qbasiclexer.py
+++ b/tests/test_qbasiclexer.py
@@ -19,23 +19,23 @@ def lexer():
 
 
 def test_keywords_with_dollar(lexer):
-    fragment = u'DIM x\nx = RIGHT$("abc", 1)\n'
+    fragment = 'DIM x\nx = RIGHT$("abc", 1)\n'
     expected = [
-        (Token.Keyword.Declaration, u'DIM'),
-        (Token.Text.Whitespace, u' '),
-        (Token.Name.Variable.Global, u'x'),
-        (Token.Text, u'\n'),
-        (Token.Name.Variable.Global, u'x'),
-        (Token.Text.Whitespace, u' '),
-        (Token.Operator, u'='),
-        (Token.Text.Whitespace, u' '),
-        (Token.Keyword.Reserved, u'RIGHT$'),
-        (Token.Punctuation, u'('),
-        (Token.Literal.String.Double, u'"abc"'),
-        (Token.Punctuation, u','),
-        (Token.Text.Whitespace, u' '),
-        (Token.Literal.Number.Integer.Long, u'1'),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n'),
+        (Token.Keyword.Declaration, 'DIM'),
+        (Token.Text.Whitespace, ' '),
+        (Token.Name.Variable.Global, 'x'),
+        (Token.Text, '\n'),
+        (Token.Name.Variable.Global, 'x'),
+        (Token.Text.Whitespace, ' '),
+        (Token.Operator, '='),
+        (Token.Text.Whitespace, ' '),
+        (Token.Keyword.Reserved, 'RIGHT$'),
+        (Token.Punctuation, '('),
+        (Token.Literal.String.Double, '"abc"'),
+        (Token.Punctuation, ','),
+        (Token.Text.Whitespace, ' '),
+        (Token.Literal.Number.Integer.Long, '1'),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n'),
     ]
     assert list(lexer.get_tokens(fragment)) == expected