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

# Conflicts:
#	tests/test_shell.py

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/test_rtf_formatter.py b/tests/test_rtf_formatter.py
index 6f60d06e..dc4fffb4 100644
--- a/tests/test_rtf_formatter.py
+++ b/tests/test_rtf_formatter.py
@@ -27,10 +27,10 @@ def _build_message(*args, **kwargs):
     result = _escape(kwargs.get('result', ''))
 
     if string is None:
-        string = (u"The expected output of '{t}'\n"
-                  u"\t\tShould be '{expected}'\n"
-                  u"\t\tActually outputs '{result}'\n"
-                  u"\t(WARNING: Partial Output of Result!)")
+        string = ("The expected output of '{t}'\n"
+                  "\t\tShould be '{expected}'\n"
+                  "\t\tActually outputs '{result}'\n"
+                  "\t(WARNING: Partial Output of Result!)")
 
     end = -len(_escape(foot))
     start = end - len(expected)
@@ -51,31 +51,31 @@ def format_rtf(t):
 
 
 def test_rtf_header():
-    t = u''
+    t = ''
     result = format_rtf(t)
     expected = r'{\rtf1\ansi\uc0'
-    msg = (u"RTF documents are expected to start with '{expected}'\n"
-           u"\t\tStarts intead with '{result}'\n"
-           u"\t(WARNING: Partial Output of Result!)".format(
+    msg = ("RTF documents are expected to start with '{expected}'\n"
+           "\t\tStarts intead with '{result}'\n"
+           "\t(WARNING: Partial Output of Result!)".format(
                expected=expected,
                result=result[:len(expected)]))
     assert result.startswith(expected), msg
 
 
 def test_rtf_footer():
-    t = u''
+    t = ''
     result = format_rtf(t)
     expected = ''
-    msg = (u"RTF documents are expected to end with '{expected}'\n"
-           u"\t\tEnds intead with '{result}'\n"
-           u"\t(WARNING: Partial Output of Result!)".format(
+    msg = ("RTF documents are expected to end with '{expected}'\n"
+           "\t\tEnds intead with '{result}'\n"
+           "\t(WARNING: Partial Output of Result!)".format(
                expected=_escape(expected),
                result=_escape(result[-len(expected):])))
     assert result.endswith(expected+foot), msg
 
 
 def test_ascii_characters():
-    t = u'a b c d ~'
+    t = 'a b c d ~'
     result = format_rtf(t)
     expected = (r'a b c d ~')
     msg = _build_message(t=t, result=result, expected=expected)
@@ -83,7 +83,7 @@ def test_ascii_characters():
 
 
 def test_escape_characters():
-    t = u'\\ {{'
+    t = '\\ {{'
     result = format_rtf(t)
     expected = r'\\ \{\{'
     msg = _build_message(t=t, result=result, expected=expected)
@@ -91,7 +91,7 @@ def test_escape_characters():
 
 
 def test_single_characters():
-    t = u'â € ¤ каждой'
+    t = 'â € ¤ каждой'
     result = format_rtf(t)
     expected = (r'{\u226} {\u8364} {\u164} '
                 r'{\u1082}{\u1072}{\u1078}{\u1076}{\u1086}{\u1081}')
@@ -100,7 +100,7 @@ def test_single_characters():
 
 
 def test_double_characters():
-    t = u'က 힣 ↕ ↕︎ 鼖'
+    t = 'က 힣 ↕ ↕︎ 鼖'
     result = format_rtf(t)
     expected = (r'{\u4096} {\u55203} {\u8597} '
                 r'{\u8597}{\u65038} {\u55422}{\u56859}')