FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Gentoo > Gentoo Portage Developer

 
 
LinkBack Thread Tools
 
Old 07-01-2008, 11:26 AM
Ali Polatel
 
Default Replace has_key() with the in operator (bin)

---
bin/dispatch-conf | 6 +++---
bin/dohtml | 6 +++---
bin/glsa-check | 4 ++--
bin/repoman | 14 +++++++-------
4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 28516c9..a8159cd 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -75,7 +75,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"])
@@ -273,7 +273,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
@@ -337,7 +337,7 @@ class dispatch:
conf = re.sub (r'._cfgd+_', ', 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 d65a31a..ab8ff3a 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -86,11 +86,11 @@ class OptionsClass:
self.ED = ""
self.DOCDESTTREE = ""

- if os.environ.has_key("PF"):
+ if "PF" in os.environ:
self.PF = os.environ["PF"]
- if os.environ.has_key("ED"):
+ if "ED" in os.environ:
self.ED = os.environ["ED"]
- 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 cdd1db3..2cff501 100644
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -295,12 +295,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 93c01f6..701dbfc 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -660,7 +660,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]]]
@@ -668,7 +668,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.")
@@ -1327,7 +1327,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]
@@ -1372,7 +1372,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)

@@ -1412,7 +1412,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
@@ -1825,7 +1825,7 @@ else:
if "PORTAGE_GPG_KEY" not in repoman_settings:
raise portage.exception.MissingParameter("PORTAGE_GPG_KE Y 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:
@@ -1840,7 +1840,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+")"
--
1.5.6.1

--
gentoo-portage-dev@lists.gentoo.org mailing list
 

Thread Tools




All times are GMT. The time now is 08:15 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org