From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-2518-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4901A1381FA
for <garchives@archives.gentoo.org>; Sun, 30 Dec 2012 03:34:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 12652E0205
for <garchives@archives.gentoo.org>; Sun, 30 Dec 2012 03:34:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 12520E06AF
for <gentoo-catalyst@lists.gentoo.org>; Sun, 30 Dec 2012 03:25:00 +0000 (UTC)
Received: from localhost.localdomain (67-197-108-252.rh5.cm.dyn.comporium.net [67.197.108.252])
(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
(Authenticated sender: mattst88)
by smtp.gentoo.org (Postfix) with ESMTPSA id D290233D83B;
Sun, 30 Dec 2012 03:24:59 +0000 (UTC)
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gmail.com>
Subject: [gentoo-catalyst] [PATCH 3/3] Use 'in' instead of deprecated has_key()
Date: Sat, 29 Dec 2012 19:27:25 -0800
Message-Id: <1356838045-15517-3-git-send-email-mattst88@gentoo.org>
X-Mailer: git-send-email 1.7.8.6
In-Reply-To: <1356838045-15517-1-git-send-email-mattst88@gentoo.org>
References: <1356838045-15517-1-git-send-email-mattst88@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
X-Archives-Salt: 114d1d2c-85c7-4c68-a982-39965f5b8fe4
X-Archives-Hash: 0361745052c696350ba1f42052ed61f2
From: Matt Turner <mattst88@gmail.com>
---
modules/generic_stage_target.py | 20 ++++++++------------
modules/netboot_target.py | 2 +-
modules/stage2_target.py | 2 +-
modules/stage4_target.py | 2 +-
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 9e49ee8..0a473ef 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -475,7 +475,7 @@ class generic_stage_target(generic_target):
"base_dirs","bind","chroot_setup","setup_environment",\
"run_local","preclean","unbind","clean"]
# if "TARBALL" in self.settings or \
-# not self.settings.has_key("FETCH"):
+# "FETCH" not in self.settings:
if "FETCH" not in self.settings:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
@@ -1444,8 +1444,7 @@ class generic_stage_target(generic_target):
If we need to pass special options to the bootloader
for this kernel put them into the environment
"""
- if self.settings.has_key("boot/kernel/"+kname+\
- "/kernelopts"):
+ if "boot/kernel/"+kname+"/kernelopts" in self.settings:
myopts=self.settings["boot/kernel/"+kname+\
"/kernelopts"]
@@ -1456,8 +1455,7 @@ class generic_stage_target(generic_target):
else:
self.env[kname+"_kernelopts"]=""
- if not self.settings.has_key("boot/kernel/"+kname+\
- "/extraversion"):
+ if "boot/kernel/"+kname+"/extraversion" not in self.settings:
self.settings["boot/kernel/"+kname+\
"/extraversion"]=""
@@ -1465,8 +1463,7 @@ class generic_stage_target(generic_target):
self.settings["boot/kernel/"+kname+\
"/extraversion"]
- if self.settings.has_key("boot/kernel/"+kname+\
- "/initramfs_overlay"):
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
if os.path.exists(self.settings["boot/kernel/"+\
kname+"/initramfs_overlay"]):
print "Copying initramfs_overlay dir "+\
@@ -1491,8 +1488,7 @@ class generic_stage_target(generic_target):
" kernel "+kname,\
"Runscript kernel build failed",env=self.env)
- if self.settings.has_key("boot/kernel/"+kname+\
- "/initramfs_overlay"):
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
if os.path.exists(self.settings["chroot_path"]+\
"/tmp/initramfs_overlay/"):
print "Cleaning up temporary overlay dir"
@@ -1636,7 +1632,7 @@ class generic_stage_target(generic_target):
array.sort()
for j in array:
contents=generate_contents(file,contents_function=j,\
- verbose=self.settings.has_key("VERBOSE"))
+ verbose="VERBOSE" in self.settings)
if contents:
myf.write(contents)
myf.close()
@@ -1657,12 +1653,12 @@ class generic_stage_target(generic_target):
if "all" in array:
for k in hash_map.keys():
hash=generate_hash(f,hash_function=k,verbose=\
- self.settings.has_key("VERBOSE"))
+ "VERBOSE" in self.settings)
myf.write(hash)
else:
for j in array:
hash=generate_hash(f,hash_function=j,verbose=\
- self.settings.has_key("VERBOSE"))
+ "VERBOSE" in self.settings)
myf.write(hash)
myf.close()
diff --git a/modules/netboot_target.py b/modules/netboot_target.py
index c77943b..ff2c81f 100644
--- a/modules/netboot_target.py
+++ b/modules/netboot_target.py
@@ -46,7 +46,7 @@ class netboot_target(generic_stage_target):
# unless the user wants specific CFLAGS/CXXFLAGS, let's use -Os
for envvar in "CFLAGS", "CXXFLAGS":
- if not os.environ.has_key(envvar) and not addlargs.has_key(envvar)
+ if envvar not in os.environ and envvar not in addlargs:
self.settings[envvar] = "-Os -pipe"
def set_root_path(self):
diff --git a/modules/stage2_target.py b/modules/stage2_target.py
index 4b3c29a..6083e2b 100644
--- a/modules/stage2_target.py
+++ b/modules/stage2_target.py
@@ -16,7 +16,7 @@ class stage2_target(generic_stage_target):
generic_stage_target.__init__(self,spec,addlargs)
def set_source_path(self):
- if "SEEDCACHE") and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/") in self.settings:
+ if "SEEDCACHE" in self.settings and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")):
self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
else:
self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
diff --git a/modules/stage4_target.py b/modules/stage4_target.py
index 65c9dd0..ce41b2d 100644
--- a/modules/stage4_target.py
+++ b/modules/stage4_target.py
@@ -32,7 +32,7 @@ class stage4_target(generic_stage_target):
"clean"]
# if "TARBALL" in self.settings or \
-# not self.settings.has_key("FETCH"):
+# "FETCH" not in self.settings:
if "FETCH" not in self.settings:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
--
1.7.8.6