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

# Conflicts:
#	tests/test_shell.py

1 files changed, 2 insertions, 2 deletions

diff --git a/pygments/lexers/mime.py b/pygments/lexers/mime.py
index f5bae8bd..4c6bbd5f 100644
--- a/pygments/lexers/mime.py
+++ b/pygments/lexers/mime.py
@@ -100,7 +100,7 @@ class MIMELexer(RegexLexer):
 
         # skip first newline
         if entire_body[0] == '\n':
-            yield pos_body_start, Text.Whitespace, u'\n'
+            yield pos_body_start, Text.Whitespace, '\n'
             pos_body_start = pos_body_start + 1
             entire_body = entire_body[1:]
 
@@ -176,7 +176,7 @@ class MIMELexer(RegexLexer):
         prefix_len = match.start(1) - match.start(0)
         yield match.start(0), Text.Whitespace, match.group(0)[:prefix_len]
         yield match.start(1), Name.Label, match.group(2)
-        yield match.end(2), String.Delimiter, u"/"
+        yield match.end(2), String.Delimiter, '/'
         yield match.start(3), Name.Label, match.group(3)
 
     def get_content_type_subtokens(self, match):