Get rid of uses of has_key().

cli.py

@@ -345,7 +345,7 @@ def errorSummary(self, errstring):
  p = re.compile('needs (\d+)MB on the (\S+) filesystem')
  disk = {}
  for m in p.finditer(errstring):
- if not disk.has_key(m.group(2)):
+ if m.group(2) not in disk:
  disk[m.group(2)] = int(m.group(1))
  if disk[m.group(2)] < int(m.group(1)):
  disk[m.group(2)] = int(m.group(1))

rpmUtils/transaction.py

@@ -94,9 +94,8 @@ def test(self, cb, conf={}):
  self.addTsFlag(rpm.RPMTRANS_FLAG_TEST)
  # FIXME GARBAGE - remove once this is reimplemented elsehwere
  # KEEPING FOR API COMPLIANCE ONLY
- if conf.has_key('diskspacecheck'):
- if conf['diskspacecheck'] == 0:
- self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE)
+ if conf.get('diskspacecheck') == 0:
+ self.ts.setProbFilter(rpm.RPMPROB_FILTER_DISKSPACE)
  tserrors = self.ts.run(cb.callback, '')
 
  reserrors = []
@@ -151,7 +150,7 @@ def _return_all_provides(hdr):
  preq = 0
  tup = miscutils.pkgTupleFromHeader(h)
  for p in _return_all_provides(h):
- if req.has_key(p):
+ if p in req:
  # Don't count a package that provides its require
  s = req[p]
  if len(s) > 1 or tup not in s:

rpmUtils/updates.py

@@ -91,7 +91,7 @@ def delPackage(self, pkgtup):
  self._delFromDict(self.updating_dict, self.updatesdict.get(pkgtup, []), pkgtup)
  self._delFromDict(self.updatesdict, self.updating_dict.get(pkgtup, []), pkgtup)
 
- if self.rawobsoletes.has_key(pkgtup):
+ if pkgtup in self.rawobsoletes:
  if self._obsoletes_by_name:
  for name, flag, version in self.rawobsoletes[pkgtup]:
  self._delFromDict(self._obsoletes_by_name, [name], (flag, version, pkgtup))
@@ -111,12 +111,12 @@ def makeNADict(self, pkglist, Nonelists):
 
  returndict = {}
  for (n, a, e, v, r) in pkglist:
- if not returndict.has_key((n, a)):
+ if (n, a) not in returndict:
  returndict[(n, a)] = []
  returndict[(n, a)].append((e,v,r))
 
  if Nonelists:
- if not returndict.has_key((n, None)):
+ if (n, None) not in returndict:
  returndict[(n, None)] = []
  returndict[(n, None)].append((a, e, v, r))
 
@@ -199,7 +199,7 @@ def checkForObsolete(self, pkglist, newest=1):
  returndict = {}
  for new in obslist:
  for old in obsdict[new]:
- if not returndict.has_key(old):
+ if old not in returndict:
  returndict[old] = []
  returndict[old].append(new)
 
@@ -221,21 +221,21 @@ def doObsoletes(self):
  # 
  obs_arches = {}
  for (n, a, e, v, r) in self.rawobsoletes:
- if not obs_arches.has_key(n):
+ if n not in obs_arches:
  obs_arches[n] = []
  obs_arches[n].append(a)
 
  for pkgtup in self.rawobsoletes:
  (name, arch, epoch, ver, rel) = pkgtup
  for (obs_n, flag, (obs_e, obs_v, obs_r)) in self.rawobsoletes[(pkgtup)]:
- if self.installdict.has_key((obs_n, None)):
+ if (obs_n, None) in self.installdict:
  for (rpm_a, rpm_e, rpm_v, rpm_r) in self.installdict[(obs_n, None)]:
  if flag in [None, 0] or \
  rpmUtils.miscutils.rangeCheck((obs_n, flag, (obs_e, obs_v, obs_r)),
  (obs_n, rpm_a, rpm_e, rpm_v, rpm_r)):
  # make sure the obsoleting pkg is not already installed
  willInstall = 1
- if self.installdict.has_key((name, None)):
+ if (name, None) in self.installdict:
  for (ins_a, ins_e, ins_v, ins_r) in self.installdict[(name, None)]:
  pkgver = (epoch, ver, rel)
  installedver = (ins_e, ins_v, ins_r)
@@ -245,7 +245,7 @@ def doObsoletes(self):
  if rpm_a != arch and rpm_a in obs_arches[name]:
  willInstall = 0
  if willInstall:
- if not obsdict.has_key(pkgtup):
+ if pkgtup not in obsdict:
  obsdict[pkgtup] = []
  obsdict[pkgtup].append((obs_n, rpm_a, rpm_e, rpm_v, rpm_r))
  self.obsoletes = obsdict
@@ -258,7 +258,7 @@ def makeObsoletedDict(self):
  self.obsoleted_dict = {}
  for new in self.obsoletes:
  for old in self.obsoletes[new]:
- if not self.obsoleted_dict.has_key(old):
+ if old not in self.obsoleted_dict:
  self.obsoleted_dict[old] = []
  self.obsoleted_dict[old].append(new)
  self.obsoleting_dict = {}
@@ -309,7 +309,7 @@ def doUpdates(self):
 
  for (n, a) in newpkgs:
  # simple ones - look for exact matches or older stuff
- if self.installdict.has_key((n, a)):
+ if (n, a) in self.installdict:
  for (rpm_e, rpm_v, rpm_r) in self.installdict[(n, a)]:
  try:
  (e, v, r) = self.returnNewest(newpkgs[(n,a)])
@@ -362,14 +362,14 @@ def doUpdates(self):
  for (n, a) in simpleupdate:
  # try to be as precise as possible
  if n in self.exactarchlist:
- if self.installdict.has_key((n, a)):
+ if (n, a) in self.installdict:
  (rpm_e, rpm_v, rpm_r) = self.returnNewest(self.installdict[(n, a)])
- if newpkgs.has_key((n,a)):
+ if (n, a) in newpkgs:
  (e, v, r) = self.returnNewest(newpkgs[(n, a)])
  rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
  if rc > 0:
  # this is definitely an update - put it in the dict
- if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
+ if (n, a, rpm_e, rpm_v, rpm_r) not in updatedict:
  updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
  updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
 
@@ -379,12 +379,12 @@ def doUpdates(self):
  # we just need to find the arch of the installed pkg so we can 
  # check it's (e, v, r)
  (rpm_a, rpm_e, rpm_v, rpm_r) = self.installdict[(n, None)][0]
- if newpkgs.has_key((n, None)):
+ if (n, None) in newpkgs:
  for (a, e, v, r) in newpkgs[(n, None)]:
  rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
  if rc > 0:
  # this is definitely an update - put it in the dict
- if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
+ if (n, rpm_a, rpm_e, rpm_v, rpm_r) not in updatedict:
  updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
  updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
 
@@ -400,7 +400,7 @@ def doUpdates(self):
 
  archlists = []
  if self._is_multilib:
- if rpmUtils.arch.multilibArches.has_key(self.myarch):
+ if self.myarch in rpmUtils.arch.multilibArches:
  biarches = [self.myarch]
  else:
  biarches = [self.myarch, rpmUtils.arch.arches[self.myarch]]
@@ -445,7 +445,7 @@ def doUpdates(self):
  rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
  if rc > 0:
  # this is definitely an update - put it in the dict
- if not updatedict.has_key((n, a, rpm_e, rpm_v, rpm_r)):
+ if (n, a, rpm_e, rpm_v, rpm_r) not in updatedict:
  updatedict[(n, a, rpm_e, rpm_v, rpm_r)] = []
  updatedict[(n, a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
  else:
@@ -479,7 +479,7 @@ def doUpdates(self):
  rc = rpmUtils.miscutils.compareEVR((e, v, r), (rpm_e, rpm_v, rpm_r))
  if rc > 0:
  # this is definitely an update - put it in the dict
- if not updatedict.has_key((n, rpm_a, rpm_e, rpm_v, rpm_r)):
+ if (n, rpm_a, rpm_e, rpm_v, rpm_r) not in updatedict:
  updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)] = []
  updatedict[(n, rpm_a, rpm_e, rpm_v, rpm_r)].append((n, a, e, v, r))
 
@@ -493,7 +493,7 @@ def makeUpdatingDict(self):
  self.updating_dict = {}
  for old in self.updatesdict:
  for new in self.updatesdict[old]:
- if not self.updating_dict.has_key(new):
+ if new not in self.updating_dict:
  self.updating_dict[new] = []
  self.updating_dict[new].append(old)
 
@@ -688,7 +688,7 @@ def _reduceListNewestByNameArch(self, tuplelist):
  highdict = {}
  for pkgtup in tuplelist:
  (n, a, e, v, r) = pkgtup
- if not highdict.has_key((n, a)):
+ if (n, a) not in highdict:
  highdict[(n, a)] = pkgtup
  else:
  pkgtup2 = highdict[(n, a)]

yum-updatesd.py

@@ -118,9 +118,7 @@ def _levelMap(self, lvl):
  "DEBUG": syslog.LOG_DEBUG }
  if type(lvl) == int:
  return lvl
- if level_map.has_key(lvl.upper()):
- return level_map[lvl.upper()]
- return syslog.LOG_INFO
+ return level_map.get(lvl.upper(), syslog.LOG_INFO)
 
  def _facilityMap(self, facility):
  facility_map = { "KERN": syslog.LOG_KERN,
@@ -142,9 +140,7 @@ def _facilityMap(self, facility):
  "LOCAL7": syslog.LOG_LOCAL7,}
  if type(facility) == int:
  return facility
- elif facility_map.has_key(facility.upper()):
- return facility_map[facility.upper()]
- return syslog.LOG_DAEMON
+ return facility_map.get(facility.upper(), syslog.LOG_DAEMON)
 
 
 class EmailUpdateEmitter(UpdateEmitter):

yum/__init__.py

@@ -2110,10 +2110,7 @@ def searchGenerator(self, fields, criteria, showdups=True, keys=False):
  the search keys in the results. """
  sql_fields = []
  for f in fields:
- if RPM_TO_SQLITE.has_key(f):
- sql_fields.append(RPM_TO_SQLITE[f])
- else:
- sql_fields.append(f)
+ sql_fields.append(RPM_TO_SQLITE.get(f, f))
 
  # yield the results in order of most terms matched first
  sorted_lists = {} # count_of_matches = [(pkgobj, 
@@ -2258,7 +2255,7 @@ def searchPackages(self, fields, criteria, callback=None):
  for (po, matched_strings) in match_gen:
  if callback:
  callback(po, matched_strings)
- if not matches.has_key(po):
+ if po not in matches:
  matches[po] = []
 
  matches[po].extend(matched_strings)
@@ -2550,7 +2547,7 @@ def selectGroup(self, grpid, group_package_types=[], enable_group_conditionals=N
 
  pkgs = packagesNewestByName(pkgs)
 
- if not self.tsInfo.conditionals.has_key(cond):
+ if cond not in self.tsInfo.conditionals:
  self.tsInfo.conditionals[cond] = []
  self.tsInfo.conditionals[cond].extend(pkgs)
  return txmbrs_used
@@ -2994,7 +2991,7 @@ def install(self, po=None, **kwargs):
 
  pkgbyname = {}
  for pkg in pkgs:
- if not pkgbyname.has_key(pkg.name):
+ if pkg.name not in pkgbyname:
  pkgbyname[pkg.name] = [ pkg ]
  else:
  pkgbyname[pkg.name].append(pkg)
@@ -4363,9 +4360,7 @@ def add_enable_repo(self, repoid, baseurls=[], mirrorlist=None, **kwargs):
  newrepo = yumRepo.YumRepository(repoid)
  newrepo.name = repoid
  newrepo.basecachedir = self.conf.cachedir
- var_convert = True
- if kwargs.has_key('variable_convert') and not kwargs['variable_convert']:
- var_convert = False
+ var_convert = kwargs.get('variable_convert', True)
 
  if baseurls:
  replaced = []

yum/comps.py

@@ -32,10 +32,7 @@
 lang_attr = '{http:https://www.w3.org/XML/1998/namespace}lang'
 
 def parse_boolean(strng):
- if BOOLEAN_STATES.has_key(strng.lower()):
- return BOOLEAN_STATES[strng.lower()]
- else:
- return False
+ return BOOLEAN_STATES.get(strng.lower(), False)
 
 def parse_number(strng):
  return int(strng)
@@ -235,11 +232,11 @@ def add(self, obj):
 
  # name and description translations
  for lang in obj.translated_name:
- if not self.translated_name.has_key(lang):
+ if lang not in self.translated_name:
  self.translated_name[lang] = obj.translated_name[lang]
 
  for lang in obj.translated_description:
- if not self.translated_description.has_key(lang):
+ if lang not in self.translated_description:
  self.translated_description[lang] = obj.translated_description[lang]
 
  def xml(self):
@@ -348,11 +345,11 @@ def add(self, obj):
 
  # name and description translations
  for lang in obj.translated_name:
- if not self.translated_name.has_key(lang):
+ if lang not in self.translated_name:
  self.translated_name[lang] = obj.translated_name[lang]
 
  for lang in obj.translated_description:
- if not self.translated_description.has_key(lang):
+ if lang not in self.translated_description:
  self.translated_description[lang] = obj.translated_description[lang]
 
  def xml(self):
@@ -424,7 +421,7 @@ def return_groups(self, group_pattern, case_sensitive=False):
 
  for item in group_pattern.split(','):
  item = item.strip()
- if self._groups.has_key(item):
+ if item in self._groups:
  thisgroup = self._groups[item]
  returns[thisgroup.groupid] = thisgroup
  continue
@@ -490,14 +487,14 @@ def return_categories(self, pattern, ignore_case=True):
  return returns.values()
 
  def add_group(self, group):
- if self._groups.has_key(group.groupid):
+ if group.groupid in self._groups:
  thatgroup = self._groups[group.groupid]
  thatgroup.add(group)
  else:
  self._groups[group.groupid] = group
 
  def add_category(self, category):
- if self._categories.has_key(category.categoryid):
+ if category.categoryid in self._categories:
  thatcat = self._categories[category.categoryid]
  thatcat.add(category)
  else:
@@ -557,7 +554,7 @@ def compile(self, pkgtuplist):
  check_pkgs = group.optional_packages.keys() + group.default_packages.keys() + group.conditional_packages.keys()
  group.installed = False
  for pkgname in check_pkgs:
- if inst_pkg_names.has_key(pkgname):
+ if pkgname in inst_pkg_names:
  group.installed = True
  break
 

yum/depsolve.py

@@ -895,7 +895,7 @@ def _checkRemove(self, txmbr):
  for prov in provs:
  if prov[0].startswith('rpmlib('): # ignore rpmlib() provides
  continue
- if newpoprovs.has_key(prov):
+ if prov in newpoprovs:
  continue
  # FIXME: This is probably the best place to fix the postfix rename
  # problem long term (post .21) ... see compare_providers.

yum/mdparser.py

@@ -132,7 +132,7 @@ def __init__(self, elem):
  elif name in ('checksum', 'location'): 
  p.update(self._prefixprops(child, name))
  p[name + '_value'] = child.text
- if name == 'location' and not p.has_key("location_base"):
+ if name == 'location' and "location_base" not in p:
  p["location_base"] = None
 
  elif name == 'format':