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

# Conflicts:
#	tests/test_shell.py

2 files changed, 2 insertions, 2 deletions

diff --git a/scripts/check_sources.py b/scripts/check_sources.py
index 4c0a27b5..0762c967 100755
--- a/scripts/check_sources.py
+++ b/scripts/check_sources.py
@@ -197,7 +197,7 @@ def main(argv):
                 if not in_pygments_pkg and checker.only_pkg:
                     continue
                 for lno, msg in checker(fn, lines):
-                    print(u"%s:%d: %s" % (fn, lno, msg), file=out)
+                    print('%s:%d: %s' % (fn, lno, msg), file=out)
                     num += 1
     if verbose:
         print()
diff --git a/scripts/debug_lexer.py b/scripts/debug_lexer.py
index d00b6102..0f1dc0bd 100755
--- a/scripts/debug_lexer.py
+++ b/scripts/debug_lexer.py
@@ -86,7 +86,7 @@ class DebuggingRegexLexer(ExtendedRegexLexer):
                         # at EOL, reset state to 'root'
                         ctx.stack = ['root']
                         statetokens = tokendefs['root']
-                        yield ctx.pos, Text, u'\n'
+                        yield ctx.pos, Text, '\n'
                         ctx.pos += 1
                         continue
                     yield ctx.pos, Error, text[ctx.pos]