contrib: drop py2 support from testparseutil.py

contrib/testparseutil.py

@@ -7,14 +7,12 b''
 
 
 import abc
+import builtins
 import re
-import sys
 
 ####################
 # for Python3 compatibility (almost comes from mercurial/pycompat.py)
 
-ispy3 = sys.version_info[0] >= 3
-
 
 def identity(a):
     return a
@@ -38,29 +36,21 b' def rapply(f, xs):'
     return _rapply(f, xs)
 
 
-if ispy3:
-    import builtins
-
     def bytestr(s):
         # tiny version of pycompat.bytestr
         return s.encode('latin1')
 
+
     def sysstr(s):
         if isinstance(s, builtins.str):
             return s
         return s.decode('latin-1')
 
+
     def opentext(f):
         return open(f, 'r')
 
 
-else:
-    bytestr = str
-    sysstr = identity
-
-    opentext = open
-
-
 def b2s(x):
     # convert BYTES elements in "x" to SYSSTR recursively
     return rapply(sysstr, x)