Use 'in' instead of deprecated has_key()

[catalyst.git] / modules / stage1_target.py

diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index 6a439ecac9ba7f1c9f612e39cbd530d7289608ee..aa4392664e35d471c48e33e1f75939befaf6e84c 100644 (file)
--- a/modules/stage1_target.py
+++ b/modules/stage1_target.py
@@ -33,24 +33,24 @@ class stage1_target(generic_stage_target):
        # XXX: How do these override_foo() functions differ from the ones in generic_stage_target and why aren't they in stage3_target?
 
        def override_chost(self):
        # XXX: How do these override_foo() functions differ from the ones in generic_stage_target and why aren't they in stage3_target?
 
        def override_chost(self):

-               if self.settings.has_key("chost"):
+               if "chost" in self.settings:

                        self.settings["CHOST"]=list_to_string(self.settings["chost"])
 
        def override_cflags(self):
                        self.settings["CHOST"]=list_to_string(self.settings["chost"])
 
        def override_cflags(self):

-               if self.settings.has_key("cflags"):
+               if "cflags" in self.settings:

                        self.settings["CFLAGS"]=list_to_string(self.settings["cflags"])
 
        def override_cxxflags(self):
                        self.settings["CFLAGS"]=list_to_string(self.settings["cflags"])
 
        def override_cxxflags(self):

-               if self.settings.has_key("cxxflags"):
+               if "cxxflags" in self.settings:

                        self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"])
 
        def override_ldflags(self):
                        self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"])
 
        def override_ldflags(self):

-               if self.settings.has_key("ldflags"):
+               if "ldflags" in self.settings:

                        self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"])
 
        def set_portage_overlay(self):
                generic_stage_target.set_portage_overlay(self)
                        self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"])
 
        def set_portage_overlay(self):
                generic_stage_target.set_portage_overlay(self)

-               if self.settings.has_key("portage_overlay"):
+               if "portage_overlay" in self.settings:

                        print "\nWARNING !!!!!"
                        print "\tUsing an portage overlay for earlier stages could cause build issues."
                        print "\tIf you break it, you buy it. Don't complain to us about it."
                        print "\nWARNING !!!!!"
                        print "\tUsing an portage overlay for earlier stages could cause build issues."
                        print "\tIf you break it, you buy it. Don't complain to us about it."