[master 12/16] Do not use variable from an inner comprehension in tests

M4rtinK installerbot-noreply at redhat.com
Fri Apr 10 13:38:18 UTC 2015


From: Vratislav Podzimek <vpodzime at redhat.com>

In Python 3 such variable is not visible/defined, but it shouldn't be used in
Python 2 neither.

Also replace two list comprehensions with generator expressions.
---
 tests/formats_test/labeling_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/formats_test/labeling_test.py b/tests/formats_test/labeling_test.py
index 25206b1..82a61b7 100755
--- a/tests/formats_test/labeling_test.py
+++ b/tests/formats_test/labeling_test.py
@@ -76,12 +76,12 @@ def testGetLabelArgs(self):
 
         # JFS, XFS use a -L flag
         lflag_classes = [fs.JFS, fs.XFS]
-        for name, klass in [(k, v) for k, v in self.fs.items() if any(isinstance(v, c) for c in lflag_classes)]:
-            self.assertEqual(klass._labelfs.label_app.setLabelCommand(v), [klass._labelfs.label_app.name, "-L", "myfs", "/dev"], msg=name)
+        for name, klass in ((k, v) for k, v in self.fs.items() if any(isinstance(v, c) for c in lflag_classes)):
+            self.assertEqual(klass._labelfs.label_app.setLabelCommand(klass), [klass._labelfs.label_app.name, "-L", "myfs", "/dev"], msg=name)
 
         # Ext2FS and descendants and FATFS do not use a flag
         noflag_classes = [fs.Ext2FS, fs.FATFS]
-        for name, klass in [(k, v) for k, v in self.fs.items() if any(isinstance(v, c) for c in noflag_classes)]:
+        for name, klass in ((k, v) for k, v in self.fs.items() if any(isinstance(v, c) for c in noflag_classes)):
             self.assertEqual(klass._labelfs.label_app.setLabelCommand(klass), [klass._labelfs.label_app.name, "/dev", "myfs"], msg=name)
 
         # all of the remaining are non-labeling so will accept any label


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/1bf3a775dd40c09dbc65557513e94d695f8ecaac


More information about the anaconda-patches mailing list