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

# Conflicts:
#	tests/test_shell.py

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/test_whiley.py b/tests/test_whiley.py
index e844dafb..c895e17f 100644
--- a/tests/test_whiley.py
+++ b/tests/test_whiley.py
@@ -19,13 +19,13 @@ def lexer():
 
 
 def test_whiley_operator(lexer):
-    fragment = u'123 \u2200 x\n'
+    fragment = '123 \u2200 x\n'
     tokens = [
-        (Token.Literal.Number.Integer, u'123'),
-        (Token.Text, u' '),
-        (Token.Operator, u'\u2200'),
-        (Token.Text, u' '),
-        (Token.Name, u'x'),
-        (Token.Text, u'\n'),
+        (Token.Literal.Number.Integer, '123'),
+        (Token.Text, ' '),
+        (Token.Operator, '\u2200'),
+        (Token.Text, ' '),
+        (Token.Name, 'x'),
+        (Token.Text, '\n'),
     ]
     assert list(lexer.get_tokens(fragment)) == tokens