Merge pull request #32786 from compnerd/2-steps-forward-3-steps-back

test: make `test_util` more python 3 friendly

Author: compnerd

utils/incrparse/test_util.py

@@ -22,7 +22,8 @@ def escapeCmdArg(arg):
 
 
 def run_command(cmd):
-    cmd = list(map(lambda s: s.encode('utf-8'), cmd))
+    if sys.version_info[0] < 3:
+        cmd = list(map(lambda s: s.encode('utf-8'), cmd))
     print(' '.join([escapeCmdArg(arg) for arg in cmd]))
     return subprocess.check_output(cmd, stderr=subprocess.STDOUT)