[yum-commits] debuginfo-install.py plugins/keys yum-complete-transaction.py yum-debug-dump.py yumdownloader.py

[Tim Lauridsen]

 debuginfo-install.py        |    1 -
 plugins/keys/keys.py        |    2 +-
 yum-complete-transaction.py |    2 +-
 yum-debug-dump.py           |    4 ++++
 yumdownloader.py            |    2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit f5548cc21f6dee7f4a1e0ea6e20f55b477d0439c
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Sat Jun 5 10:51:23 2010 +0200

    Fix pylint errors
    
    ************* Module debuginfo-install
    W0611: 26: Unused import to_unicode
    ************* Module yum-complete-transaction
    E0602:238:YumCompleteTransaction.main: Undefined variable 'YumBaseError'
    ************* Module yum-debug-dump
    E1103:100:YumDebugDump.dump_yum_config_info: Instance of 'DummyYumPlugins' has no '_plugins' member (but some types could not be inferred)
    ************* Module yumdownloader
    W0611: 22: Unused import getCacheDir
    ************* Module keys
    E9905:229:KeysInfoCommand.show_key: Too many arguments for format string

diff --git a/debuginfo-install.py b/debuginfo-install.py
index 8f8663a..bc83b6b 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -23,7 +23,6 @@ import yum.Errors
 
 from utils import YumUtilBase
 from yum import _
-from yum.i18n import to_unicode
 
 import logging
 import rpmUtils
diff --git a/plugins/keys/keys.py b/plugins/keys/keys.py
index 48db342..1b980db 100644
--- a/plugins/keys/keys.py
+++ b/plugins/keys/keys.py
@@ -226,7 +226,7 @@ Key owner : %s
 Key email : %s
 Repo      : installed
 Created   : %s
-""" % (key.sum_type, rpmkeyid,
+""" % (rpmkeyid,
        key.sum_auth_name, key.sum_auth_email, time.ctime(key.createts))
         else:
             gpg_cert = yum.pgpmsg.decode_msg(key.data)
diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
index fb39107..81731c9 100755
--- a/yum-complete-transaction.py
+++ b/yum-complete-transaction.py
@@ -235,7 +235,7 @@ class YumCompleteTransaction(YumUtilBase):
                 else:
                     print "Not removing old transaction files"
                     sys.exit()
-            except YumBaseError,e:
+            except yum.Errors.YumBaseError,e:
                 print "Error: %s" % str(e)
                 sys.exit(1)                
 
diff --git a/yum-debug-dump.py b/yum-debug-dump.py
index 0ef90b2..f993a3f 100644
--- a/yum-debug-dump.py
+++ b/yum-debug-dump.py
@@ -91,6 +91,9 @@ class YumDebugDump(yum.YumBase):
         msg += "  python ver: %s\n" % sys.version.replace('\n', '')
         return msg
 
+# remove pylint false positive
+# Instance of 'DummyYumPlugins' has no '_plugins' member (but some types could not be inferred)
+# pylint: disable-msg=E1103
     def dump_yum_config_info(self):
         msg = "%%%%YUM INFO\n"
         msg += "  arch: %s\n" % self.conf.yumvar['arch']
@@ -100,6 +103,7 @@ class YumDebugDump(yum.YumBase):
         msg += "  enabled plugins: %s\n" % ",".join(self.plugins._plugins.keys())
         msg += "  global excludes: %s\n" % ",".join(self.conf.exclude)
         return msg
+# pylint: enable-msg=E1103
 
     # FIXME: This should use rpmdb.check_*()
     def dump_rpm_problems(self):
diff --git a/yumdownloader.py b/yumdownloader.py
index e718430..6af3682 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -19,7 +19,7 @@ import os.path
 sys.path.insert(0,'/usr/share/yum-cli')
 
 import yum
-from yum.misc import getCacheDir, setup_locale
+from yum.misc import setup_locale
 from yum.packages import parsePackages
 from yum.Errors import RepoError
 from utils import YumUtilBase