diff options
| -rwxr-xr-x | bin/dispatch-conf | 6 | ||||
| -rwxr-xr-x | bin/dohtml | 6 | ||||
| -rw-r--r-- | bin/glsa-check | 4 | ||||
| -rwxr-xr-x | bin/repoman | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 8ae055565..07131b55e 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -72,7 +72,7 @@ class dispatch: self.options = portage.dispatch_conf.read_config(MANDATORY_OPTS) - if self.options.has_key("log-file"): + if "log-file" in self.options: if os.path.isfile(self.options["log-file"]): shutil.copy(self.options["log-file"], self.options["log-file"] + '.old') if os.path.isfile(self.options["log-file"]) \ @@ -270,7 +270,7 @@ class dispatch: show_new_diff = 1 continue elif c == 'e': - if not os.environ.has_key('EDITOR'): + if 'EDITOR' not in os.environ: os.environ['EDITOR']='nano' os.system(os.environ['EDITOR'] + ' ' + newconf) continue @@ -334,7 +334,7 @@ class dispatch: conf = re.sub (r'\._cfg\d+_', '', nconf) dir = re.match (r'^(.+)/', nconf).group (1) - if h.has_key (conf): + if conf in h: mrgconf = re.sub(r'\._cfg', '._mrg', h[conf]['new']) if os.path.exists(mrgconf): os.unlink(mrgconf) diff --git a/bin/dohtml b/bin/dohtml index 6162b0199..56f95bbfa 100755 --- a/bin/dohtml +++ b/bin/dohtml @@ -86,11 +86,11 @@ class OptionsClass: self.D = "" self.DOCDESTTREE = "" - if os.environ.has_key("PF"): + if "PF" in os.environ: self.PF = os.environ["PF"] - if os.environ.has_key("D"): + if "D" in os.environ: self.D = os.environ["D"] - if os.environ.has_key("_E_DOCDESTTREE_"): + if "_E_DOCDESTTREE_" in os.environ: self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"] self.allowed_exts = [ 'htm', 'html', 'css', 'js', diff --git a/bin/glsa-check b/bin/glsa-check index 8d955526a..82fb5e49d 100644 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -293,12 +293,12 @@ if mode == "mail": # color doesn't make any sense for mail nocolor() - if portage.settings.has_key("PORTAGE_ELOG_MAILURI"): + if "PORTAGE_ELOG_MAILURI" in portage.settings: myrecipient = portage.settings["PORTAGE_ELOG_MAILURI"].split()[0] else: myrecipient = "root@localhost" - if portage.settings.has_key("PORTAGE_ELOG_MAILFROM"): + if "PORTAGE_ELOG_MAILFROM" in portage.settings: myfrom = portage.settings["PORTAGE_ELOG_MAILFROM"] else: myfrom = "glsa-check" diff --git a/bin/repoman b/bin/repoman index a131eadc5..09042b1e2 100755 --- a/bin/repoman +++ b/bin/repoman @@ -662,7 +662,7 @@ if os.path.exists(descfile): if not os.path.isdir(portdir+"/profiles/"+arch[1]): print "Invalid "+arch[2]+" profile ("+arch[1]+") for arch "+arch[0] continue - if profiles.has_key(arch[0]): + if arch[0] in profiles: profiles[arch[0]]+= [[arch[1], arch[2]]] else: profiles[arch[0]] = [[arch[1], arch[2]]] @@ -670,7 +670,7 @@ if os.path.exists(descfile): for x in repoman_settings.archlist(): if x[0] == "~": continue - if not profiles.has_key(x): + if x not in profiles: print red("\""+x+"\" doesn't have a valid profile listed in profiles.desc.") print red("You need to either \"cvs update\" your profiles dir or follow this") print red("up with the "+x+" team.") @@ -1335,7 +1335,7 @@ for x in scanlist: # uselist checks - local mykey = portage.dep_getkey(catpkg) - if luselist.has_key(mykey): + if mykey in luselist: for mypos in range(len(myuse)-1,-1,-1): if myuse[mypos] and (myuse[mypos] in luselist[mykey]): del myuse[mypos] @@ -1380,7 +1380,7 @@ for x in scanlist: if myskey not in kwlist: stats["KEYWORDS.invalid"] += 1 fails["KEYWORDS.invalid"].append(x+"/"+y+".ebuild: %s" % mykey) - elif not profiles.has_key(myskey): + elif myskey not in profiles: stats["KEYWORDS.invalid"] += 1 fails["KEYWORDS.invalid"].append(x+"/"+y+".ebuild: %s (profile invalid)" % mykey) @@ -1420,7 +1420,7 @@ for x in scanlist: for keyword,arch,groups in arches: - if not profiles.has_key(arch): + if arch not in profiles: # A missing profile will create an error further down # during the KEYWORDS verification. continue @@ -1833,7 +1833,7 @@ else: if "PORTAGE_GPG_KEY" not in repoman_settings: raise portage.exception.MissingParameter("PORTAGE_GPG_KEY is unset!") if "PORTAGE_GPG_DIR" not in repoman_settings: - if os.environ.has_key("HOME"): + if "HOME" in os.environ: repoman_settings["PORTAGE_GPG_DIR"] = os.path.join(os.environ["HOME"], ".gnupg") logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman_settings["PORTAGE_GPG_DIR"]) else: @@ -1848,7 +1848,7 @@ else: repoman_settings["PORTAGE_GPG_DIR"]) gpgcmd = "gpg --sign --clearsign --yes " gpgcmd+= "--default-key "+repoman_settings["PORTAGE_GPG_KEY"] - if repoman_settings.has_key("PORTAGE_GPG_DIR"): + if "PORTAGE_GPG_DIR" in repoman_settings: gpgcmd += " --homedir "+repoman_settings["PORTAGE_GPG_DIR"] if options.pretend: print "("+gpgcmd+" "+filename+")" |