diff -r 9ed70525fd6e -r 1fb0a85fb20e mercurial/fileset.py
--- a/mercurial/fileset.py	Mon May 29 16:08:37 2017 +0530
+++ b/mercurial/fileset.py	Mon May 29 16:21:15 2017 +0530
@@ -14,6 +14,7 @@
     error,
     merge,
     parser,
+    pycompat,
     registrar,
     scmutil,
     util,
@@ -43,6 +44,7 @@
 
 def tokenize(program):
     pos, l = 0, len(program)
+    program = pycompat.bytestr(program)
     while pos < l:
         c = program[pos]
         if c.isspace(): # skip inter-token whitespace