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

# Conflicts:
#	tests/test_shell.py

1 files changed, 3 insertions, 3 deletions

diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py
index 2bad339a..aab502e2 100644
--- a/pygments/lexers/php.py
+++ b/pygments/lexers/php.py
@@ -116,13 +116,13 @@ class PsyshConsoleLexer(Lexer):
         insertions = []
         for match in line_re.finditer(text):
             line = match.group()
-            if line.startswith(u'>>> ') or line.startswith(u'... '):
+            if line.startswith('>>> ') or line.startswith('... '):
                 insertions.append((len(curcode),
                                    [(0, Generic.Prompt, line[:4])]))
                 curcode += line[4:]
-            elif line.rstrip() == u'...':
+            elif line.rstrip() == '...':
                 insertions.append((len(curcode),
-                                   [(0, Generic.Prompt, u'...')]))
+                                   [(0, Generic.Prompt, '...')]))
                 curcode += line[3:]
             else:
                 if curcode: