[yum-commits] Branch 'yum-3_2_X' - 2 commits - cli.py yum/depsolve.py yum/__init__.py yum/pgpmsg.py yum/sqlitesack.py

[Tim Lauridsen]

 cli.py            |    2 --
 yum/__init__.py   |    2 +-
 yum/depsolve.py   |    3 +--
 yum/pgpmsg.py     |    2 +-
 yum/sqlitesack.py |    2 --
 5 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 23b5e7bcbb8bbf8344f1e762d6f2727d91446767
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Oct 14 11:41:29 2009 +0200

    fix pylint warnings (unneeded lambda)
    
    ************* Module yum
    W0108:3927:YumBase._limit_installonly_pkgs.<lambda>: Lambda may not be necessary
    ************* Module yum.depsolve
    W0108:594:Depsolve._requiringFromTransaction.<lambda>: Lambda may not be necessary
    ************* Module yum.pgpmsg
    W0108:571:signature.deserialize_subpacket.<lambda>: Lambda may not be necessary

diff --git a/yum/__init__.py b/yum/__init__.py
index f73cc3e..aa8228e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3924,7 +3924,7 @@ class YumBase(depsolve.Depsolve):
                             toremove.append(po)
                             numleft -= 1
                         
-        map(lambda x: self.tsInfo.addErase(x), toremove)
+        map(self.tsInfo.addErase, toremove)
 
     def processTransaction(self, callback=None,rpmTestDisplay=None, rpmDisplay=None):
         '''
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 7ee7cac..40be000 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -590,7 +590,7 @@ class Depsolve(object):
             # before, they're not going to be installed anymore, so we
             # should mark them to be re-checked
             if upgraded.has_key(best.pkgtup):
-                map(lambda x: self.tsInfo.remove(x), upgraded[best.pkgtup])
+                map(self.tsInfo.remove, upgraded[best.pkgtup])
 
         checkdeps = 1
         
diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 2d9e7d9..4f0ff7e 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -568,7 +568,7 @@ class signature(pgp_packet) :
             idx = idx + sublen - 1
             return (subtype, expr), idx
         if subtype == SIG_SUB_TYPE_PREF_SYMM_ALGO or subtype == SIG_SUB_TYPE_PREF_HASH_ALGO or subtype == SIG_SUB_TYPE_PREF_COMP_ALGO or subtype == SIG_SUB_TYPE_KEY_FLAGS :
-            algo_list = map(lambda x : ord(x), list(msg[idx:idx+sublen-1]))
+            algo_list = map(ord, list(msg[idx:idx+sublen-1]))
             idx = idx + sublen - 1
             return (subtype, algo_list), idx
         if subtype == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
commit 9a31303c4a8ce0ab5be9e85b903b448dafb173af
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Oct 14 11:15:13 2009 +0200

    fix pylint warnings (imports)
    
    ************* Module cli
    W0611: 42: Unused import parsePackages
    W0611: 41: Unused import rpmUtils
    ************* Module yum.depsolve
    W0611: 39: Unused import itemgetter
    ************* Module yum.sqlitesack
    W0404: 65: Reimport 're' (imported line 39)
    W0404: 66: Reimport 'fnmatch' (imported line 24)

diff --git a/cli.py b/cli.py
index 332be99..b098a9f 100644
--- a/cli.py
+++ b/cli.py
@@ -38,8 +38,6 @@ import yum.logginglevels
 import yum.misc
 import yum.plugins
 from rpmUtils.arch import isMultiLibArch
-import rpmUtils.miscutils
-from yum.packages import parsePackages
 from yum import _
 from yum.rpmtrans import RPMTransaction
 import signal
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 8bed47c..7ee7cac 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -36,7 +36,6 @@ import logginglevels
 import Errors
 import warnings
 warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
-from operator import itemgetter
 
 from yum import _
 
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index bc4b0ab..5d96a96 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -62,8 +62,6 @@ def _share_data(value):
     return misc.share_data(value)
 
 # FIXME: parsePackages()
-import re
-import fnmatch
 def _parse_pkg_n(match, regexp_match, n):
     if match == n:
         return True