commit 506e311c381677928ab68fd62e441deb24f2f7c3
author Jens Geyer <jensg@apache.org> Sun May 17 22:48:51 2020 +0200
committer Jens Geyer <jensg@apache.org> Tue May 19 00:00:29 2020 +0200
tree c1a11c8d7d5bdcea72be82fe6914056026bdbab2
parent 1ab096c80af1a2bca73aef78675de914a1834fd9

FIX: CI error at ./test/py/TestServer.py:178:26: F507 '...' % ... has 1 placeholder(s) but 6 substitution(s)
FIX: CI error at ./test/crossrunner/compat.py:11:21: E741 ambiguous variable name 'l'
Patch: Jens Geyer

This closes #2147

test/crossrunner/compat.py

diff --git a/test/crossrunner/compat.py b/test/crossrunner/compat.py
index f1ca91b..932a48c 100644
--- a/test/crossrunner/compat.py
+++ b/test/crossrunner/compat.py
@@ -8,9 +8,9 @@
         bin_args = map(lambda a: a.decode(_ENCODE), args)
         return os.path.join(*bin_args).encode(_ENCODE)
 
-    def str_join(s, l):
-        bin_args = map(lambda a: a.decode(_ENCODE), l)
-        b = s.decode(_ENCODE)
+    def str_join(left, right):
+        bin_args = map(lambda a: a.decode(_ENCODE), right)
+        b = left.decode(_ENCODE)
         return b.join(bin_args).encode(_ENCODE)
 
     logfile_open = open