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>

34 files changed, 34 insertions, 34 deletions

diff --git a/test/pacman/tests/depconflict100.py b/test/pacman/tests/depconflict100.py
index 948017d9..72cbec6a 100644
--- a/test/pacman/tests/depconflict100.py
+++ b/test/pacman/tests/depconflict100.py
@@ -7,7 +7,7 @@ self.addpkg2db("sync", sp1);
 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")
diff --git a/test/pacman/tests/depconflict120.py b/test/pacman/tests/depconflict120.py
index a9f3f6b3..8e9ab06b 100644
--- a/test/pacman/tests/depconflict120.py
+++ b/test/pacman/tests/depconflict120.py
@@ -11,7 +11,7 @@ lp = pmpkg("pkg2", "1.0-1")
 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")
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
index b1ad5e18..4777f93a 100644
--- a/test/pacman/tests/fileconflict001.py
+++ b/test/pacman/tests/fileconflict001.py
@@ -18,7 +18,7 @@ p2.files = ["dir/",
             "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")
diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py
index 1e6113c1..17ca6186 100644
--- a/test/pacman/tests/fileconflict002.py
+++ b/test/pacman/tests/fileconflict002.py
@@ -13,7 +13,7 @@ p2.files = ["dir/",
             "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")
diff --git a/test/pacman/tests/remove052.py b/test/pacman/tests/remove052.py
index df1e0db1..4c444e44 100644
--- a/test/pacman/tests/remove052.py
+++ b/test/pacman/tests/remove052.py
@@ -13,7 +13,7 @@ lp3 = pmpkg("pkg3")
 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")
diff --git a/test/pacman/tests/sync030.py b/test/pacman/tests/sync030.py
index 1fd97500..b904ddb9 100644
--- a/test/pacman/tests/sync030.py
+++ b/test/pacman/tests/sync030.py
@@ -10,7 +10,7 @@ p2 = pmpkg("pkg2", "1.0-2")
 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")
diff --git a/test/pacman/tests/sync031.py b/test/pacman/tests/sync031.py
index 4aa2ee39..7c5556e6 100644
--- a/test/pacman/tests/sync031.py
+++ b/test/pacman/tests/sync031.py
@@ -10,7 +10,7 @@ p2 = pmpkg("pkg2", "1.0-2")
 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")
diff --git a/test/pacman/tests/sync040.py b/test/pacman/tests/sync040.py
index e5641fe0..fa0b82d3 100644
--- a/test/pacman/tests/sync040.py
+++ b/test/pacman/tests/sync040.py
@@ -8,7 +8,7 @@ sp2 = pmpkg("pkg2")
 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:
diff --git a/test/pacman/tests/sync041.py b/test/pacman/tests/sync041.py
index 328728e2..a90bb1a5 100644
--- a/test/pacman/tests/sync041.py
+++ b/test/pacman/tests/sync041.py
@@ -9,7 +9,7 @@ sp2.conflicts = ["pkg1"]
 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")
diff --git a/test/pacman/tests/sync405.py b/test/pacman/tests/sync405.py
index 941a1af4..602b1d36 100644
--- a/test/pacman/tests/sync405.py
+++ b/test/pacman/tests/sync405.py
@@ -15,7 +15,7 @@ lp.provides = ["phonon"]
 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")
diff --git a/test/pacman/tests/sync406.py b/test/pacman/tests/sync406.py
index c15862fd..516f89a9 100644
--- a/test/pacman/tests/sync406.py
+++ b/test/pacman/tests/sync406.py
@@ -19,7 +19,7 @@ lp.provides = ["phonon"]
 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")
diff --git a/test/pacman/tests/sync891.py b/test/pacman/tests/sync891.py
index 9b99e94a..50f43fae 100644
--- a/test/pacman/tests/sync891.py
+++ b/test/pacman/tests/sync891.py
@@ -14,7 +14,7 @@ lp2.conflicts = ["pkg3"]
 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")
diff --git a/test/pacman/tests/sync892.py b/test/pacman/tests/sync892.py
index dfd889ea..d4171fe2 100644
--- a/test/pacman/tests/sync892.py
+++ b/test/pacman/tests/sync892.py
@@ -16,7 +16,7 @@ lp2.conflicts = ["pkg3"]
 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")
diff --git a/test/pacman/tests/sync893.py b/test/pacman/tests/sync893.py
index e96bb7b6..ee0bdabf 100644
--- a/test/pacman/tests/sync893.py
+++ b/test/pacman/tests/sync893.py
@@ -13,7 +13,7 @@ self.addpkg2db("local", lp1)
 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")
diff --git a/test/pacman/tests/sync898.py b/test/pacman/tests/sync898.py
index 8fd59f19..dfedd6f4 100644
--- a/test/pacman/tests/sync898.py
+++ b/test/pacman/tests/sync898.py
@@ -11,7 +11,7 @@ self.addpkg2db("sync", sp2)
 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")
diff --git a/test/pacman/tests/sync990.py b/test/pacman/tests/sync990.py
index 6ac5a1f6..38346b9b 100644
--- a/test/pacman/tests/sync990.py
+++ b/test/pacman/tests/sync990.py
@@ -11,7 +11,7 @@ sp3.conflicts = ["pkg2"]
 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")
diff --git a/test/pacman/tests/sync992.py b/test/pacman/tests/sync992.py
index 63faaaba..3b538933 100644
--- a/test/pacman/tests/sync992.py
+++ b/test/pacman/tests/sync992.py
@@ -15,7 +15,7 @@ for p in sp1, sp2, sp3:
 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")
diff --git a/test/pacman/tests/upgrade005.py b/test/pacman/tests/upgrade005.py
index 0f8c13ef..e0f77a63 100644
--- a/test/pacman/tests/upgrade005.py
+++ b/test/pacman/tests/upgrade005.py
@@ -14,7 +14,7 @@ p3.files = ["bin/pkg3", "usr/man/man1/pkg3.1"]
 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:
diff --git a/test/pacman/tests/upgrade013.py b/test/pacman/tests/upgrade013.py
index 5a327599..4497f19f 100644
--- a/test/pacman/tests/upgrade013.py
+++ b/test/pacman/tests/upgrade013.py
@@ -13,7 +13,7 @@ p2.files = ["bin/foobar",
 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")
diff --git a/test/pacman/tests/upgrade014.py b/test/pacman/tests/upgrade014.py
index 93c2fe2b..2ef759d1 100644
--- a/test/pacman/tests/upgrade014.py
+++ b/test/pacman/tests/upgrade014.py
@@ -13,7 +13,7 @@ p2.files = ["bin/foobar",
 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:
diff --git a/test/pacman/tests/upgrade030.py b/test/pacman/tests/upgrade030.py
index 8a6c473b..ff09f722 100644
--- a/test/pacman/tests/upgrade030.py
+++ b/test/pacman/tests/upgrade030.py
@@ -14,7 +14,7 @@ p2 = pmpkg("pkg2", "1.0-2")
 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")
diff --git a/test/pacman/tests/upgrade031.py b/test/pacman/tests/upgrade031.py
index 856de983..a76a3d8a 100644
--- a/test/pacman/tests/upgrade031.py
+++ b/test/pacman/tests/upgrade031.py
@@ -10,7 +10,7 @@ p2 = pmpkg("pkg2", "1.0-2")
 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")
diff --git a/test/pacman/tests/upgrade032.py b/test/pacman/tests/upgrade032.py
index 85e048e0..6348a0f6 100644
--- a/test/pacman/tests/upgrade032.py
+++ b/test/pacman/tests/upgrade032.py
@@ -10,7 +10,7 @@ p2 = pmpkg("pkg2", "1.0-2")
 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")
diff --git a/test/pacman/tests/upgrade040.py b/test/pacman/tests/upgrade040.py
index e17c7176..a445743f 100644
--- a/test/pacman/tests/upgrade040.py
+++ b/test/pacman/tests/upgrade040.py
@@ -20,7 +20,7 @@ p2.files = ["bin/foobar",
 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:
diff --git a/test/pacman/tests/upgrade041.py b/test/pacman/tests/upgrade041.py
index 20da4f14..349d0f8f 100644
--- a/test/pacman/tests/upgrade041.py
+++ b/test/pacman/tests/upgrade041.py
@@ -20,7 +20,7 @@ p2.files = ["bin/foobar"]
 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:
diff --git a/test/pacman/tests/upgrade042.py b/test/pacman/tests/upgrade042.py
index 44754991..df223931 100644
--- a/test/pacman/tests/upgrade042.py
+++ b/test/pacman/tests/upgrade042.py
@@ -17,7 +17,7 @@ p2.backup = ["etc/profile"]
 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"]
 
diff --git a/test/pacman/tests/upgrade043.py b/test/pacman/tests/upgrade043.py
index f531cb82..62a7bd08 100644
--- a/test/pacman/tests/upgrade043.py
+++ b/test/pacman/tests/upgrade043.py
@@ -17,7 +17,7 @@ p2.files = ["etc/profile**"]
 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"]
 
diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py
index d9ac66b9..0b59ca66 100644
--- a/test/pacman/tests/upgrade046.py
+++ b/test/pacman/tests/upgrade046.py
@@ -20,7 +20,7 @@ p2.files = ["bin/foobar"]
 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:
diff --git a/test/pacman/tests/upgrade050.py b/test/pacman/tests/upgrade050.py
index f05b0b62..bdda582c 100644
--- a/test/pacman/tests/upgrade050.py
+++ b/test/pacman/tests/upgrade050.py
@@ -8,7 +8,7 @@ self.addpkg(p1)
 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")
diff --git a/test/pacman/tests/upgrade059.py b/test/pacman/tests/upgrade059.py
index 9cd9f1f0..26a5810b 100644
--- a/test/pacman/tests/upgrade059.py
+++ b/test/pacman/tests/upgrade059.py
@@ -18,7 +18,7 @@ self.addpkg(p2)
 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")
diff --git a/test/pacman/tests/upgrade060.py b/test/pacman/tests/upgrade060.py
index 7a28f3eb..510562c8 100644
--- a/test/pacman/tests/upgrade060.py
+++ b/test/pacman/tests/upgrade060.py
@@ -14,7 +14,7 @@ self.addpkg(p1)
 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")
diff --git a/test/pacman/tests/upgrade061.py b/test/pacman/tests/upgrade061.py
index 310e5043..fd20c8b5 100644
--- a/test/pacman/tests/upgrade061.py
+++ b/test/pacman/tests/upgrade061.py
@@ -15,7 +15,7 @@ self.addpkg(p1)
 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")
diff --git a/test/pacman/tests/upgrade073.py b/test/pacman/tests/upgrade073.py
index 752a2336..7455ec1f 100644
--- a/test/pacman/tests/upgrade073.py
+++ b/test/pacman/tests/upgrade073.py
@@ -15,7 +15,7 @@ p3.files = ["bin/dep2"]
 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")
diff --git a/test/pacman/tests/upgrade090.py b/test/pacman/tests/upgrade090.py
index cdd4cace..9eb88948 100644
--- a/test/pacman/tests/upgrade090.py
+++ b/test/pacman/tests/upgrade090.py
@@ -16,7 +16,7 @@ sp = pmpkg("dep")
 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: