1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00

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>
This commit is contained in:
Jeremy Heiner 2013-10-12 12:44:36 -04:00 committed by Allan McRae
parent e9c7c3b90d
commit d79872b4c7
34 changed files with 34 additions and 34 deletions

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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:

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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:

View File

@ -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")

View File

@ -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:

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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:

View File

@ -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:

View File

@ -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"]

View File

@ -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"]

View File

@ -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:

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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: