Add parens around tuples in Python list comprehensions.

Reported by 2to3: optional in Python 2, but required in 3.

Signed-off-by: Jeremy Heiner <ScalaProtractor@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

test/pacman/tests/depconflict100.py

@@ -7,7 +7,7 @@
 sp2 = pmpkg("pkg2", "1.0-2")
 self.addpkg2db("sync", sp2)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/depconflict120.py

@@ -11,7 +11,7 @@
 lp.provides = ["imaginary"]
 self.addpkg2db("local", lp)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/fileconflict001.py

@@ -18,7 +18,7 @@
             "dir/symdir/file"]
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/fileconflict002.py

@@ -13,7 +13,7 @@
             "dir/symdir/file"]
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/remove052.py

@@ -13,7 +13,7 @@
 lp3.reason = 1
 self.addpkg2db("local", lp3)
 
-self.args = "-Rs %s" % " ".join([p.name for p in lp1, lp3])
+self.args = "-Rs %s" % " ".join([p.name for p in (lp1, lp3)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/sync030.py

@@ -10,7 +10,7 @@
 for p in p1, p2:
 	self.addpkg2db("sync", p)
 
-self.args = "-S --asdeps %s" % " ".join([p.name for p in p1, p2])
+self.args = "-S --asdeps %s" % " ".join([p.name for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=pkg1|1.0-2")

test/pacman/tests/sync031.py

@@ -10,7 +10,7 @@
 for p in p1, p2:
 	self.addpkg2db("sync", p)
 
-self.args = "-S --asexplicit %s" % " ".join([p.name for p in p1, p2])
+self.args = "-S --asexplicit %s" % " ".join([p.name for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=pkg1|1.0-2")

test/pacman/tests/sync040.py

@@ -8,7 +8,7 @@
 for p in sp1, sp2:
 	self.addpkg2db("sync", p);
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=1")
 for p in sp1, sp2:

test/pacman/tests/sync041.py

@@ -9,7 +9,7 @@
 for p in sp1, sp2:
 	self.addpkg2db("sync", p);
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/sync405.py

@@ -15,7 +15,7 @@
 lp.conflicts = ["phonon"]
 self.addpkg2db("local", lp)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=kdelibs")

test/pacman/tests/sync406.py

@@ -19,7 +19,7 @@
 lp.conflicts = ["phonon"]
 self.addpkg2db("local", lp)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp4])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp4)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=kdelibs")

test/pacman/tests/sync891.py

@@ -14,7 +14,7 @@
 for p in lp1, lp2:
 	self.addpkg2db("local", p)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/sync892.py

@@ -16,7 +16,7 @@
 for p in lp1, lp2:
 	self.addpkg2db("local", p)
 
-self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s --ask=4" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/sync893.py

@@ -13,7 +13,7 @@
 lp2 = pmpkg("pkg2")
 self.addpkg2db("local", lp2)
 
-self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s --ask=4" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/sync898.py

@@ -11,7 +11,7 @@
 lp1 = pmpkg("pkg1")
 self.addpkg2db("local", lp1)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=pkg1|1.0-2")

test/pacman/tests/sync990.py

@@ -11,7 +11,7 @@
 for p in sp1, sp2, sp3:
 	self.addpkg2db("sync", p)
 
-self.args = "-S %s" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/sync992.py

@@ -15,7 +15,7 @@
 lp1 = pmpkg("pkg2", "0.1-1")
 self.addpkg2db("local", lp1)
 
-self.args = "-S %s --ask=4" % " ".join([p.name for p in sp1, sp2])
+self.args = "-S %s --ask=4" % " ".join([p.name for p in (sp1, sp2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/upgrade005.py

@@ -14,7 +14,7 @@
 for p in p1, p2, p3:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2, p3])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2, p3)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2, p3:

test/pacman/tests/upgrade013.py

@@ -13,7 +13,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=dummy")

test/pacman/tests/upgrade014.py

@@ -13,7 +13,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U --force %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U --force %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2:

test/pacman/tests/upgrade030.py

@@ -14,7 +14,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_REASON=pkg1|0")

test/pacman/tests/upgrade031.py

@@ -10,7 +10,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U --asdeps %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U --asdeps %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=pkg1|1.0-2")

test/pacman/tests/upgrade032.py

@@ -10,7 +10,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U --asexplicit %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U --asexplicit %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=pkg1|1.0-2")

test/pacman/tests/upgrade040.py

@@ -20,7 +20,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2:

test/pacman/tests/upgrade041.py

@@ -20,7 +20,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2:

test/pacman/tests/upgrade042.py

@@ -17,7 +17,7 @@
 p2.depends = [ "bash" ]
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.filesystem = ["etc/profile"]
 

test/pacman/tests/upgrade043.py

@@ -17,7 +17,7 @@
 p2.backup = ["etc/profile"]
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.filesystem = ["etc/profile"]
 

test/pacman/tests/upgrade046.py

@@ -20,7 +20,7 @@
 for p in p1, p2:
 	self.addpkg(p)
 
-self.args = "-U --force %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U --force %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2:

test/pacman/tests/upgrade050.py

@@ -8,7 +8,7 @@
 p2 = pmpkg("pkg2")
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")

test/pacman/tests/upgrade059.py

@@ -18,7 +18,7 @@
 p3 = pmpkg("pkg3", "1.0-2")
 self.addpkg(p3)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p2, p3])
+self.args = "-U %s" % " ".join([p.filename() for p in (p2, p3)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_EXIST=pkg1")

test/pacman/tests/upgrade060.py

@@ -14,7 +14,7 @@
 p2 = pmpkg("pkg2", "1.1-1")
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=pkg1|1.0-1")

test/pacman/tests/upgrade061.py

@@ -15,7 +15,7 @@
 p2 = pmpkg("pkg2", "1.0-2")
 self.addpkg(p2)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2)])
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=pkg1|1.0-1")

test/pacman/tests/upgrade073.py

@@ -15,7 +15,7 @@
 for p in p1, p2, p3:
 	self.addpkg(p)
 
-self.args = "-U %s" % " ".join([p.filename() for p in p1, p2, p3])
+self.args = "-U %s" % " ".join([p.filename() for p in (p1, p2, p3)])
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=dummy|1.0-2")

test/pacman/tests/upgrade090.py

@@ -16,7 +16,7 @@
 sp.files = ["bin/dep"]
 self.addpkg2db("sync", sp)
 
-self.args = "-U %s --ask=16" % " ".join([p.filename() for p in p1, p2, p3])
+self.args = "-U %s --ask=16" % " ".join([p.filename() for p in (p1, p2, p3)])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2, sp: