lint: fix convention violations in the new source files

radekholy24 · Ales Kozumplik · commit 18ae71dd016e · 2014-08-12T08:10:59.000+02:00
diff --git a/dnf/cli/commands/updateinfo.py b/dnf/cli/commands/updateinfo.py
@@ -207,15 +207,14 @@ def _list(apkg_adv_insts):
     @classmethod
     def display_list(cls, apkg_adv_insts, mixed, description):
         """Display the list of advisories."""
-        nevrainst_id2types = cls._list(apkg_adv_insts)
         # Sort IDs and convert types to labels.
-        inst2mark = lambda ins: '' if not mixed else 'i ' if ins else '  '
+        inst2mark = lambda inst: '' if not mixed else 'i ' if inst else '  '
         nevramark2id2tlbl = OrderedDict(
             ((nevra, inst2mark(inst)),
              OrderedDict(sorted(((id_, cls.TYPE2LABEL[typ])
                                  for id_, typ in id2type.items()),
                                 key=itemgetter(0))))
-            for (nevra, inst), id2type in nevrainst_id2types)
+            for (nevra, inst), id2type in cls._list(apkg_adv_insts))
         if not nevramark2id2tlbl:
             return
         # Get all advisory IDs and types as two iterables.
@@ -285,7 +284,7 @@ def display_info(self, apkg_adv_insts, mixed, description):
         info = self._info(apkg_adv_insts).items()
         # Convert objects to string lines and mark verbose fields.
         verbse = lambda value: value if self.base.conf.verbose else None
-        title_vallines = (
+        info = (
             (tit, ([id_], [self.TYPE2LABEL[typ]], [unicode(upd)],
                    (id_title[0] + ' - ' + id_title[1] for id_title in bzs),
                    (id_title[0] for id_title in cvs), desc.splitlines(),
@@ -296,7 +295,7 @@ def display_info(self, apkg_adv_insts, mixed, description):
                   _('CVEs'), _('Description'), _('Rights'), _('Files'),
                   _('Installed'))
         width = _maxlen(labels)
-        for title, vallines in title_vallines:
+        for title, vallines in info:
             print('=' * 79)
             print('  ' + title)
             print('=' * 79)
diff --git a/scripts/pylint_false_positives b/scripts/pylint_false_positives
@@ -16,3 +16,5 @@
 ^E1101: dnf.repo:[0-9,: ]*Instance of 'PackagePayload' has no '_target_params' member$
 ^W0201: dnf.repo:[0-9,: ]*Attribute '[_a-z]+' defined outside __init__$
 ^W0212: tests[ a-z0-9,._:]*Access to a protected member .*$
+^W0613: dnf.cli.commands.updateinfo:[0-9,: ]*Unused argument 'description'$
+^W0613: dnf.cli.commands.updateinfo:[0-9,: ]*Unused argument 'mixed'$
diff --git a/tests/cli/commands/test_updateinfo.py b/tests/cli/commands/test_updateinfo.py
@@ -54,7 +54,7 @@ def _stub_print(self, *objects):
         """Pretend to print to standard output."""
         print(*objects, file=self._stdout)
 
-    def test_available_apkg_adv_insts_filter_packages(self):
+    def test_avail_filter_pkgs(self):
         """Test querying with an packages filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -66,7 +66,7 @@ def test_available_apkg_adv_insts_filter_packages(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_available_apkg_adv_insts_filter_packages_nonexistent(self):
+    def test_avail_filter_pkgs_nonex(self):
         """Test querying with a non-existent packages filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -77,7 +77,7 @@ def test_available_apkg_adv_insts_filter_packages_nonexistent(self):
             [], 'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_available_apkg_adv_insts_filter_security(self):
+    def test_avail_filter_security(self):
         """Test querying with a security filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -89,7 +89,7 @@ def test_available_apkg_adv_insts_filter_security(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_installed_apkg_adv_insts(self):
+    def test_inst(self):
         """Test installed triplets querying."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -102,7 +102,7 @@ def test_installed_apkg_adv_insts(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_installed_apkg_adv_insts_filter_bugfix(self):
+    def test_inst_filter_bugfix(self):
         """Test querying with a bugfix filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -114,7 +114,7 @@ def test_installed_apkg_adv_insts_filter_bugfix(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_installed_apkg_adv_insts_filter_enhancement(self):
+    def test_inst_filter_enhancement(self):
         """Test querying with an enhancement filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -126,7 +126,7 @@ def test_installed_apkg_adv_insts_filter_enhancement(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_updating_apkg_adv_insts(self):
+    def test_upd(self):
         """Test updating triplets querying."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -138,7 +138,7 @@ def test_updating_apkg_adv_insts(self):
             'incorrect pairs')
         cmd.clear_installed_cache()
 
-    def test_all_apkg_adv_insts(self):
+    def test_all(self):
         """Test all triplets querying."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
@@ -151,7 +151,7 @@ def test_all_apkg_adv_insts(self):
              ('tour-5-1.noarch.rpm', 'DNF-2014-3', False)])
         cmd.clear_installed_cache()
 
-    def test_all_apkg_adv_insts_filter_advisories(self):
+    def test_all_filter_advisories(self):
         """Test querying with an advisories filter."""
         cmd = dnf.cli.commands.updateinfo.UpdateInfoCommand(self.cli)
         cmd.refresh_installed_cache()
