Re: [pacman-dev] [PATCH v2 7/8] Add parens around tuples in Python list comprehensions.

12 Oct 2013

On Sat, Oct 12, 2013 at 12:44:36PM -0400, Jeremy Heiner wrote:
...
Reported by 2to3: optional in Python 2, but required in 3.
I believe the actual correct way to do string formatting here is to use
something like 'str'.format(something) instead of 'str' % something.

This is available in python 2.6, 2.7, and 3.3 at least.

http://www.python.org/dev/peps/pep-3101/ (note the 'both systems can
co-exist until it comes time to deprecate the older system.' at the end)
...
Signed-off-by: Jeremy Heiner <ScalaProtractor@gmail.com>
---
 test/pacman/tests/depconflict100.py  | 2 +-
 test/pacman/tests/depconflict120.py  | 2 +-
 test/pacman/tests/fileconflict001.py | 2 +-
 test/pacman/tests/fileconflict002.py | 2 +-
 test/pacman/tests/remove052.py       | 2 +-
 test/pacman/tests/sync030.py         | 2 +-
 test/pacman/tests/sync031.py         | 2 +-
 test/pacman/tests/sync040.py         | 2 +-
 test/pacman/tests/sync041.py         | 2 +-
 test/pacman/tests/sync405.py         | 2 +-
 test/pacman/tests/sync406.py         | 2 +-
 test/pacman/tests/sync891.py         | 2 +-
 test/pacman/tests/sync892.py         | 2 +-
 test/pacman/tests/sync893.py         | 2 +-
 test/pacman/tests/sync898.py         | 2 +-
 test/pacman/tests/sync990.py         | 2 +-
 test/pacman/tests/sync992.py         | 2 +-
 test/pacman/tests/upgrade005.py      | 2 +-
 test/pacman/tests/upgrade013.py      | 2 +-
 test/pacman/tests/upgrade014.py      | 2 +-
 test/pacman/tests/upgrade030.py      | 2 +-
 test/pacman/tests/upgrade031.py      | 2 +-
 test/pacman/tests/upgrade032.py      | 2 +-
 test/pacman/tests/upgrade040.py      | 2 +-
 test/pacman/tests/upgrade041.py      | 2 +-
 test/pacman/tests/upgrade042.py      | 2 +-
 test/pacman/tests/upgrade043.py      | 2 +-
 test/pacman/tests/upgrade046.py      | 2 +-
 test/pacman/tests/upgrade050.py      | 2 +-
 test/pacman/tests/upgrade059.py      | 2 +-
 test/pacman/tests/upgrade060.py      | 2 +-
 test/pacman/tests/upgrade061.py      | 2 +-
 test/pacman/tests/upgrade073.py      | 2 +-
 test/pacman/tests/upgrade090.py      | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/pacman/tests/depconflict100.py b/test/pacman/tests/depconflict100.py
index 948017d..72cbec6 100644
--- a/test/pacman/tests/depconflict100.py
+++ b/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)])
So, for example:
self.args = "-S {}".format(" ".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 a9f3f6b..8e9ab06 100644
--- a/test/pacman/tests/depconflict120.py
+++ b/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")
diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py
index b1ad5e1..4777f93 100644
--- a/test/pacman/tests/fileconflict001.py
+++ b/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")
diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py
index 1e6113c..17ca618 100644
--- a/test/pacman/tests/fileconflict002.py
+++ b/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")
diff --git a/test/pacman/tests/remove052.py b/test/pacman/tests/remove052.py
index df1e0db..4c444e4 100644
--- a/test/pacman/tests/remove052.py
+++ b/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")
diff --git a/test/pacman/tests/sync030.py b/test/pacman/tests/sync030.py
index 1fd9750..b904ddb 100644
--- a/test/pacman/tests/sync030.py
+++ b/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")
diff --git a/test/pacman/tests/sync031.py b/test/pacman/tests/sync031.py
index 4aa2ee3..7c5556e 100644
--- a/test/pacman/tests/sync031.py
+++ b/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")
diff --git a/test/pacman/tests/sync040.py b/test/pacman/tests/sync040.py
index e5641fe..fa0b82d 100644
--- a/test/pacman/tests/sync040.py
+++ b/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:
diff --git a/test/pacman/tests/sync041.py b/test/pacman/tests/sync041.py
index 328728e..a90bb1a 100644
--- a/test/pacman/tests/sync041.py
+++ b/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")
diff --git a/test/pacman/tests/sync405.py b/test/pacman/tests/sync405.py
index 941a1af..602b1d3 100644
--- a/test/pacman/tests/sync405.py
+++ b/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")
diff --git a/test/pacman/tests/sync406.py b/test/pacman/tests/sync406.py
index c15862f..516f89a 100644
--- a/test/pacman/tests/sync406.py
+++ b/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")
diff --git a/test/pacman/tests/sync891.py b/test/pacman/tests/sync891.py
index 9b99e94..50f43fa 100644
--- a/test/pacman/tests/sync891.py
+++ b/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")
diff --git a/test/pacman/tests/sync892.py b/test/pacman/tests/sync892.py
index dfd889e..d4171fe 100644
--- a/test/pacman/tests/sync892.py
+++ b/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")
diff --git a/test/pacman/tests/sync893.py b/test/pacman/tests/sync893.py
index e96bb7b..ee0bdab 100644
--- a/test/pacman/tests/sync893.py
+++ b/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")
diff --git a/test/pacman/tests/sync898.py b/test/pacman/tests/sync898.py
index 8fd59f1..dfedd6f 100644
--- a/test/pacman/tests/sync898.py
+++ b/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")
diff --git a/test/pacman/tests/sync990.py b/test/pacman/tests/sync990.py
index 6ac5a1f..38346b9 100644
--- a/test/pacman/tests/sync990.py
+++ b/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")
diff --git a/test/pacman/tests/sync992.py b/test/pacman/tests/sync992.py
index 63faaab..3b53893 100644
--- a/test/pacman/tests/sync992.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade005.py b/test/pacman/tests/upgrade005.py
index 0f8c13e..e0f77a6 100644
--- a/test/pacman/tests/upgrade005.py
+++ b/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:
diff --git a/test/pacman/tests/upgrade013.py b/test/pacman/tests/upgrade013.py
index 5a32759..4497f19 100644
--- a/test/pacman/tests/upgrade013.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade014.py b/test/pacman/tests/upgrade014.py
index 93c2fe2..2ef759d 100644
--- a/test/pacman/tests/upgrade014.py
+++ b/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:
diff --git a/test/pacman/tests/upgrade030.py b/test/pacman/tests/upgrade030.py
index 8a6c473..ff09f72 100644
--- a/test/pacman/tests/upgrade030.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade031.py b/test/pacman/tests/upgrade031.py
index 856de98..a76a3d8 100644
--- a/test/pacman/tests/upgrade031.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade032.py b/test/pacman/tests/upgrade032.py
index 85e048e..6348a0f 100644
--- a/test/pacman/tests/upgrade032.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade040.py b/test/pacman/tests/upgrade040.py
index e17c717..a445743 100644
--- a/test/pacman/tests/upgrade040.py
+++ b/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:
diff --git a/test/pacman/tests/upgrade041.py b/test/pacman/tests/upgrade041.py
index 20da4f1..349d0f8 100644
--- a/test/pacman/tests/upgrade041.py
+++ b/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:
diff --git a/test/pacman/tests/upgrade042.py b/test/pacman/tests/upgrade042.py
index 4475499..df22393 100644
--- a/test/pacman/tests/upgrade042.py
+++ b/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"]
diff --git a/test/pacman/tests/upgrade043.py b/test/pacman/tests/upgrade043.py
index f531cb8..62a7bd0 100644
--- a/test/pacman/tests/upgrade043.py
+++ b/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"]
diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py
index d9ac66b..0b59ca6 100644
--- a/test/pacman/tests/upgrade046.py
+++ b/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:
diff --git a/test/pacman/tests/upgrade050.py b/test/pacman/tests/upgrade050.py
index f05b0b6..bdda582 100644
--- a/test/pacman/tests/upgrade050.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade059.py b/test/pacman/tests/upgrade059.py
index 9cd9f1f..26a5810 100644
--- a/test/pacman/tests/upgrade059.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade060.py b/test/pacman/tests/upgrade060.py
index 7a28f3e..510562c 100644
--- a/test/pacman/tests/upgrade060.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade061.py b/test/pacman/tests/upgrade061.py
index 310e504..fd20c8b 100644
--- a/test/pacman/tests/upgrade061.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade073.py b/test/pacman/tests/upgrade073.py
index 752a233..7455ec1 100644
--- a/test/pacman/tests/upgrade073.py
+++ b/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")
diff --git a/test/pacman/tests/upgrade090.py b/test/pacman/tests/upgrade090.py
index cdd4cac..9eb8894 100644
--- a/test/pacman/tests/upgrade090.py
+++ b/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:
-- 
1.8.4
-- 
William Giokas | KaiSforza | http://kaictl.net/
GnuPG Key: 0x73CD09CF
Fingerprint: F73F 50EF BBE2 9846 8306  E6B8 6902 06D8 73CD 09CF

    