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

# Conflicts:
#	tests/test_shell.py

1 files changed, 123 insertions, 123 deletions

diff --git a/tests/test_ezhil.py b/tests/test_ezhil.py
index 8047a30a..beca4c65 100644
--- a/tests/test_ezhil.py
+++ b/tests/test_ezhil.py
@@ -19,71 +19,71 @@ def lexer():
 
 
 def test_sum(lexer):
-    fragment = u'1+3\n'
+    fragment = '1+3\n'
     tokens = [
-        (Number.Integer, u'1'),
-        (Operator, u'+'),
-        (Number.Integer, u'3'),
-        (Text, u'\n'),
+        (Number.Integer, '1'),
+        (Operator, '+'),
+        (Number.Integer, '3'),
+        (Text, '\n'),
     ]
     assert list(lexer.get_tokens(fragment)) == tokens
 
 
 def test_gcd_expr(lexer):
-    fragment = u'1^3+(5-5)*gcd(a,b)\n'
+    fragment = '1^3+(5-5)*gcd(a,b)\n'
     tokens = [
-        (Token.Number.Integer, u'1'),
-        (Token.Operator, u'^'),
-        (Token.Literal.Number.Integer, u'3'),
-        (Token.Operator, u'+'),
-        (Token.Punctuation, u'('),
-        (Token.Literal.Number.Integer, u'5'),
-        (Token.Operator, u'-'),
-        (Token.Literal.Number.Integer, u'5'),
-        (Token.Punctuation, u')'),
-        (Token.Operator, u'*'),
-        (Token.Name, u'gcd'),
-        (Token.Punctuation, u'('),
-        (Token.Name, u'a'),
-        (Token.Operator, u','),
-        (Token.Name, u'b'),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n')
+        (Token.Number.Integer, '1'),
+        (Token.Operator, '^'),
+        (Token.Literal.Number.Integer, '3'),
+        (Token.Operator, '+'),
+        (Token.Punctuation, '('),
+        (Token.Literal.Number.Integer, '5'),
+        (Token.Operator, '-'),
+        (Token.Literal.Number.Integer, '5'),
+        (Token.Punctuation, ')'),
+        (Token.Operator, '*'),
+        (Token.Name, 'gcd'),
+        (Token.Punctuation, '('),
+        (Token.Name, 'a'),
+        (Token.Operator, ','),
+        (Token.Name, 'b'),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n')
     ]
     assert list(lexer.get_tokens(fragment)) == tokens
 
 
 def test_if_statement(lexer):
-    fragment = u"""@( 0 > 3 ) ஆனால்
+    fragment = """@( 0 > 3 ) ஆனால்
     பதிப்பி "wont print"
 முடி"""
     tokens = [
-        (Token.Operator, u'@'),
-        (Token.Punctuation, u'('),
-        (Token.Text, u' '),
-        (Token.Literal.Number.Integer, u'0'),
-        (Token.Text, u' '),
-        (Token.Operator, u'>'),
-        (Token.Text, u' '),
-        (Token.Literal.Number.Integer, u'3'),
-        (Token.Text, u' '),
-        (Token.Punctuation, u')'),
-        (Token.Text, u' '),
-        (Token.Keyword, u'ஆனால்'),
-        (Token.Text, u'\n'),
-        (Token.Text, u'    '),
-        (Token.Keyword, u'பதிப்பி'),
-        (Token.Text, u' '),
-        (Token.Literal.String, u'"wont print"'),
-        (Token.Text, u'\n'),
-        (Token.Keyword, u'முடி'),
-        (Token.Text, u'\n')
+        (Token.Operator, '@'),
+        (Token.Punctuation, '('),
+        (Token.Text, ' '),
+        (Token.Literal.Number.Integer, '0'),
+        (Token.Text, ' '),
+        (Token.Operator, '>'),
+        (Token.Text, ' '),
+        (Token.Literal.Number.Integer, '3'),
+        (Token.Text, ' '),
+        (Token.Punctuation, ')'),
+        (Token.Text, ' '),
+        (Token.Keyword, 'ஆனால்'),
+        (Token.Text, '\n'),
+        (Token.Text, '    '),
+        (Token.Keyword, 'பதிப்பி'),
+        (Token.Text, ' '),
+        (Token.Literal.String, '"wont print"'),
+        (Token.Text, '\n'),
+        (Token.Keyword, 'முடி'),
+        (Token.Text, '\n')
     ]
     assert list(lexer.get_tokens(fragment)) == tokens
 
 
 def test_function(lexer):
-    fragment = u"""# (C) முத்தையா அண்ணாமலை 2013, 2015
+    fragment = """# (C) முத்தையா அண்ணாமலை 2013, 2015
 நிரல்பாகம்  gcd ( x, y )
 மு = max(x,y)
  q = min(x,y)
@@ -95,83 +95,83 @@ def test_function(lexer):
 முடி\n"""
     tokens = [
         (Token.Comment.Single,
-         u'# (C) \u0bae\u0bc1\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bbe \u0b85'
-         u'\u0ba3\u0bcd\u0ba3\u0bbe\u0bae\u0bb2\u0bc8 2013, 2015\n'),
-        (Token.Keyword, u'நிரல்பாகம்'),
-        (Token.Text, u'  '),
-        (Token.Name, u'gcd'),
-        (Token.Text, u' '),
-        (Token.Punctuation, u'('),
-        (Token.Text, u' '),
-        (Token.Name, u'x'),
-        (Token.Operator, u','),
-        (Token.Text, u' '),
-        (Token.Name, u'y'),
-        (Token.Text, u' '),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n'),
-        (Token.Name, u'\u0bae\u0bc1'),
-        (Token.Text, u' '),
-        (Token.Operator, u'='),
-        (Token.Text, u' '),
-        (Token.Name.Builtin, u'max'),
-        (Token.Punctuation, u'('),
-        (Token.Name, u'x'),
-        (Token.Operator, u','),
-        (Token.Name, u'y'),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n'),
-        (Token.Text, u' '),
-        (Token.Name, u'q'),
-        (Token.Text, u' '),
-        (Token.Operator, u'='),
-        (Token.Text, u' '),
-        (Token.Name.Builtin, u'min'),
-        (Token.Punctuation, u'('),
-        (Token.Name, u'x'),
-        (Token.Operator, u','),
-        (Token.Name, u'y'),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n'),
-        (Token.Text, u'\n'),
-        (Token.Operator, u'@'),
-        (Token.Punctuation, u'('),
-        (Token.Text, u' '),
-        (Token.Name, u'q'),
-        (Token.Text, u' '),
-        (Token.Operator, u'=='),
-        (Token.Text, u' '),
-        (Token.Literal.Number.Integer, u'0'),
-        (Token.Text, u' '),
-        (Token.Punctuation, u')'),
-        (Token.Text, u' '),
-        (Token.Keyword, u'ஆனால்'),
-        (Token.Text, u'\n'),
-        (Token.Text, u'       '),
-        (Token.Keyword, u'பின்கொடு'),
-        (Token.Text, u'  '),
-        (Token.Name, u'\u0bae\u0bc1'),
-        (Token.Text, u'\n'),
-        (Token.Keyword, u'முடி'),
-        (Token.Text, u'\n'),
-        (Token.Keyword, u'\u0baa\u0bbf\u0ba9\u0bcd\u0b95\u0bca\u0b9f\u0bc1'),
-        (Token.Text, u'  '),
-        (Token.Name, u'gcd'),
-        (Token.Punctuation, u'('),
-        (Token.Text, u' '),
-        (Token.Name, u'\u0bae\u0bc1'),
-        (Token.Text, u' '),
-        (Token.Operator, u'-'),
-        (Token.Text, u' '),
-        (Token.Name, u'q'),
-        (Token.Text, u' '),
-        (Token.Operator, u','),
-        (Token.Text, u' '),
-        (Token.Name, u'q'),
-        (Token.Text, u' '),
-        (Token.Punctuation, u')'),
-        (Token.Text, u'\n'),
-        (Token.Keyword, u'முடி'),  # u'\u0bae\u0bc1\u0b9f\u0bbf'),
-        (Token.Text, u'\n')
+         '# (C) \u0bae\u0bc1\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bbe \u0b85'
+         '\u0ba3\u0bcd\u0ba3\u0bbe\u0bae\u0bb2\u0bc8 2013, 2015\n'),
+        (Token.Keyword, 'நிரல்பாகம்'),
+        (Token.Text, '  '),
+        (Token.Name, 'gcd'),
+        (Token.Text, ' '),
+        (Token.Punctuation, '('),
+        (Token.Text, ' '),
+        (Token.Name, 'x'),
+        (Token.Operator, ','),
+        (Token.Text, ' '),
+        (Token.Name, 'y'),
+        (Token.Text, ' '),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n'),
+        (Token.Name, '\u0bae\u0bc1'),
+        (Token.Text, ' '),
+        (Token.Operator, '='),
+        (Token.Text, ' '),
+        (Token.Name.Builtin, 'max'),
+        (Token.Punctuation, '('),
+        (Token.Name, 'x'),
+        (Token.Operator, ','),
+        (Token.Name, 'y'),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n'),
+        (Token.Text, ' '),
+        (Token.Name, 'q'),
+        (Token.Text, ' '),
+        (Token.Operator, '='),
+        (Token.Text, ' '),
+        (Token.Name.Builtin, 'min'),
+        (Token.Punctuation, '('),
+        (Token.Name, 'x'),
+        (Token.Operator, ','),
+        (Token.Name, 'y'),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n'),
+        (Token.Text, '\n'),
+        (Token.Operator, '@'),
+        (Token.Punctuation, '('),
+        (Token.Text, ' '),
+        (Token.Name, 'q'),
+        (Token.Text, ' '),
+        (Token.Operator, '=='),
+        (Token.Text, ' '),
+        (Token.Literal.Number.Integer, '0'),
+        (Token.Text, ' '),
+        (Token.Punctuation, ')'),
+        (Token.Text, ' '),
+        (Token.Keyword, 'ஆனால்'),
+        (Token.Text, '\n'),
+        (Token.Text, '       '),
+        (Token.Keyword, 'பின்கொடு'),
+        (Token.Text, '  '),
+        (Token.Name, '\u0bae\u0bc1'),
+        (Token.Text, '\n'),
+        (Token.Keyword, 'முடி'),
+        (Token.Text, '\n'),
+        (Token.Keyword, '\u0baa\u0bbf\u0ba9\u0bcd\u0b95\u0bca\u0b9f\u0bc1'),
+        (Token.Text, '  '),
+        (Token.Name, 'gcd'),
+        (Token.Punctuation, '('),
+        (Token.Text, ' '),
+        (Token.Name, '\u0bae\u0bc1'),
+        (Token.Text, ' '),
+        (Token.Operator, '-'),
+        (Token.Text, ' '),
+        (Token.Name, 'q'),
+        (Token.Text, ' '),
+        (Token.Operator, ','),
+        (Token.Text, ' '),
+        (Token.Name, 'q'),
+        (Token.Text, ' '),
+        (Token.Punctuation, ')'),
+        (Token.Text, '\n'),
+        (Token.Keyword, 'முடி'),  # '\u0bae\u0bc1\u0b9f\u0bbf'),
+        (Token.Text, '\n')
     ]
     assert list(lexer.get_tokens(fragment)) == tokens