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:
parent
e9c7c3b90d
commit
d79872b4c7
|
@ -7,7 +7,7 @@
|
||||||
sp2 = pmpkg("pkg2", "1.0-2")
|
sp2 = pmpkg("pkg2", "1.0-2")
|
||||||
self.addpkg2db("sync", sp2)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
lp.provides = ["imaginary"]
|
lp.provides = ["imaginary"]
|
||||||
self.addpkg2db("local", lp)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
"dir/symdir/file"]
|
"dir/symdir/file"]
|
||||||
self.addpkg(p2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"dir/symdir/file"]
|
"dir/symdir/file"]
|
||||||
self.addpkg(p2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
lp3.reason = 1
|
lp3.reason = 1
|
||||||
self.addpkg2db("local", lp3)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg2db("sync", p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg2db("sync", p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
for p in sp1, sp2:
|
for p in sp1, sp2:
|
||||||
self.addpkg2db("sync", p);
|
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("PACMAN_RETCODE=1")
|
||||||
for p in sp1, sp2:
|
for p in sp1, sp2:
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
for p in sp1, sp2:
|
for p in sp1, sp2:
|
||||||
self.addpkg2db("sync", p);
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
lp.conflicts = ["phonon"]
|
lp.conflicts = ["phonon"]
|
||||||
self.addpkg2db("local", lp)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=kdelibs")
|
self.addrule("PKG_EXIST=kdelibs")
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
lp.conflicts = ["phonon"]
|
lp.conflicts = ["phonon"]
|
||||||
self.addpkg2db("local", lp)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=kdelibs")
|
self.addrule("PKG_EXIST=kdelibs")
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
for p in lp1, lp2:
|
for p in lp1, lp2:
|
||||||
self.addpkg2db("local", p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
for p in lp1, lp2:
|
for p in lp1, lp2:
|
||||||
self.addpkg2db("local", p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
lp2 = pmpkg("pkg2")
|
lp2 = pmpkg("pkg2")
|
||||||
self.addpkg2db("local", lp2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
lp1 = pmpkg("pkg1")
|
lp1 = pmpkg("pkg1")
|
||||||
self.addpkg2db("local", lp1)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
for p in sp1, sp2, sp3:
|
for p in sp1, sp2, sp3:
|
||||||
self.addpkg2db("sync", p)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
lp1 = pmpkg("pkg2", "0.1-1")
|
lp1 = pmpkg("pkg2", "0.1-1")
|
||||||
self.addpkg2db("local", lp1)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
for p in p1, p2, p3:
|
for p in p1, p2, p3:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2, p3:
|
for p in p1, p2, p3:
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=dummy")
|
self.addrule("!PKG_EXIST=dummy")
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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")
|
self.addrule("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_REASON=pkg1|0")
|
self.addrule("PKG_REASON=pkg1|0")
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
self.addrule("PKG_VERSION=pkg1|1.0-2")
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
p2.depends = [ "bash" ]
|
p2.depends = [ "bash" ]
|
||||||
self.addpkg(p2)
|
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"]
|
self.filesystem = ["etc/profile"]
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
p2.backup = ["etc/profile"]
|
p2.backup = ["etc/profile"]
|
||||||
self.addpkg(p2)
|
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"]
|
self.filesystem = ["etc/profile"]
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
self.addpkg(p)
|
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")
|
self.addrule("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2:
|
for p in p1, p2:
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
p2 = pmpkg("pkg2")
|
p2 = pmpkg("pkg2")
|
||||||
self.addpkg(p2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("!PKG_EXIST=pkg1")
|
self.addrule("!PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
p3 = pmpkg("pkg3", "1.0-2")
|
p3 = pmpkg("pkg3", "1.0-2")
|
||||||
self.addpkg(p3)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("PKG_EXIST=pkg1")
|
self.addrule("PKG_EXIST=pkg1")
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
p2 = pmpkg("pkg2", "1.1-1")
|
p2 = pmpkg("pkg2", "1.1-1")
|
||||||
self.addpkg(p2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-1")
|
self.addrule("PKG_VERSION=pkg1|1.0-1")
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
p2 = pmpkg("pkg2", "1.0-2")
|
p2 = pmpkg("pkg2", "1.0-2")
|
||||||
self.addpkg(p2)
|
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("PACMAN_RETCODE=1")
|
||||||
self.addrule("PKG_VERSION=pkg1|1.0-1")
|
self.addrule("PKG_VERSION=pkg1|1.0-1")
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
for p in p1, p2, p3:
|
for p in p1, p2, p3:
|
||||||
self.addpkg(p)
|
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("PACMAN_RETCODE=0")
|
||||||
self.addrule("PKG_VERSION=dummy|1.0-2")
|
self.addrule("PKG_VERSION=dummy|1.0-2")
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
sp.files = ["bin/dep"]
|
sp.files = ["bin/dep"]
|
||||||
self.addpkg2db("sync", sp)
|
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")
|
self.addrule("PACMAN_RETCODE=0")
|
||||||
for p in p1, p2, sp:
|
for p in p1, p2, sp:
|
||||||
|
|
Loading…
Reference in New Issue