Changeset 4479

Timestamp:

04/10/09 01:25:05 (4 years ago)

Author:

getxsick

Message:

dict.keys() is no more needed for iterate. fix for #260

Location:

trunk/umit

Files:

• core/NmapCommand.py (modified) (1 diff)
• core/NmapOptions.py (modified) (1 diff)
• core/OSList.py (modified) (1 diff)
• core/Scheduler.py (modified) (2 diffs)
• core/UmitConf.py (modified) (2 diffs)
• core/UmitDB.py (modified) (3 diffs)
• gui/DiffCompare.py (modified) (1 diff)
• gui/OptionBuilder.py (modified) (1 diff)
• gui/ScanNotebook.py (modified) (3 diffs)
• gui/ScriptManager.py (modified) (1 diff)
• gui/SearchGUI.py (modified) (1 diff)
• gui/radialnet/Image.py (modified) (1 diff)
• gui/radialnet/RadialNet.py (modified) (2 diffs)
• inventory/DataGrabber.py (modified) (1 diff)
• inventory/InventoryLoad.py (modified) (1 diff)
• inventory/TLBarDisplay.py (modified) (1 diff)
• inventory/TLChangesTree.py (modified) (3 diffs)

trunk/umit/core/NmapCommand.py

@@ -339 +339 @@
 
     def remove_option(self, option_name):
-        if option_name in self.options.keys():
+        if option_name in self.options:
             self.options.pop(option_name)
 

trunk/umit/core/NmapOptions.py

@@ -110 +110 @@
     
     def __get_list (self, dict):
-        return [element for element in dict.keys()]
+        return dict.keys()
     
 

trunk/umit/core/OSList.py

@@ -36 +36 @@
 
     def get_match_list(self, osclass):
-        if osclass in self.os.keys():
+        if osclass in self.os:
             return self.os[osclass]
         return None

trunk/umit/core/Scheduler.py

@@ -245 +245 @@
         if self.schema_parser.has_section(name):
             for opt in self.schema_parser.options(name):
-                if opt in self.options.keys():
+                if opt in self.options:
                     self.options[opt](self.schema_parser.get(name, opt))
 
@@ -260 +260 @@
         if p_cfg.has_section(self.profile):
             for opt in p_cfg.options(self.profile):
-                if opt in self.profile_opts.keys():
+                if opt in self.profile_opts:
                     self.profile_opts[opt](p_cfg.get(self.profile, opt))
 

trunk/umit/core/UmitConf.py

@@ -211 +211 @@
             options = {}
         elif isinstance(options, dict):
-            self._set_it(profile_name, "options", ",".join(options.keys()))
+            self._set_it(profile_name, "options", ",".join(options))
 
         for opt in options:
@@ -276 +276 @@
             if options[opt]:
                 self._set_it(profile, opt, options[opt])
-        self._set_it(profile, 'options', ",".join(options.keys()))
+        self._set_it(profile, 'options', ",".join(options))
 
     def get_profile(self, profile_name):

trunk/umit/core/UmitDB.py

@@ -120 +120 @@
     def insert(self, **kargs):
         sql = "INSERT INTO %s ("
-        for k in kargs.keys():
+        for k in kargs:
             sql += k
             sql += ", "
@@ -199 +199 @@
     def __init__(self, **kargs):
         Table.__init__(self, "scans")
-        if "scans_id" in kargs.keys():
+        if "scans_id" in kargs:
             self.scans_id = kargs["scans_id"]
         else:
@@ -205 +205 @@
             fields = ["scan_name", "nmap_xml_output", "date"]
             
-            for k in kargs.keys():
+            for k in kargs:
                 if k not in fields:
                     raise Exception("Wrong table field passed to creation \
 method. '%s'" % k)
 
-            if "nmap_xml_output" not in kargs.keys() or \
+            if "nmap_xml_output" not in kargs or \
                not kargs["nmap_xml_output"]:
                 raise Exception("Can't save result without xml output")

trunk/umit/gui/DiffCompare.py

@@ -183 +183 @@
         scan_id = 1
         new_scan_name = scan_name
-        while new_scan_name in self.scan_dict.keys():
+        while new_scan_name in self.scan_dict:
             new_scan_name = "%s (%s)" % (scan_name, scan_id)
             scan_id += 1

trunk/umit/gui/OptionBuilder.py

@@ -57 +57 @@
             except:pass
             else:
-                if option_element.tagName in actions.keys():
+                if option_element.tagName in actions:
                     self.widgets_list.append(
                             actions[option_element.tagName](option_element,

trunk/umit/gui/ScanNotebook.py

@@ -786 +786 @@
                         continue
                     
-                    if name not in self.services.keys():
+                    if name not in self.services:
                         self.services[name] = {"hosts":[]}
                     
@@ -882 +882 @@
                 current_ip = match_host.groups()[0]
             if match_os:
-                if current_ip not in fingerprints.keys():
+                if current_ip not in fingerprints:
                     fingerprints[current_ip] = {}
                 
                 fingerprints[current_ip]["os"] = match_os.groups()[0]
             if match_service:
-                if current_ip not in fingerprints.keys():
+                if current_ip not in fingerprints:
                     fingerprints[current_ip] = {}
 
@@ -911 +911 @@
         """
 
-        key_num = len(fingerprints.keys())
+        key_num = len(fingerprints)
         dialog_text = ("Umit has found that %s. The submission and "
             "registration of fingerprints are very important for you "

trunk/umit/gui/ScriptManager.py

@@ -199 +199 @@
 
     def get_selected(self):
-        return ";".join([script.path for script in self.d.keys() if self.d[script]])
+        return ";".join([script.path for script in self.d if self.d[script]])
 
     def is_selected(self, script):

trunk/umit/gui/SearchGUI.py

@@ -887 +887 @@
         self.entry.set_width_chars(4)
 
-        for i in SearchConfig().time_list.keys():
+        for i in SearchConfig().time_list:
             self.time_list.append([i])
 

trunk/umit/gui/radialnet/Image.py

@@ -47 +47 @@
             return False
 
-        if icon + image_type not in self.__cache.keys():
+        if icon + image_type not in self.__cache:
 
             file = self.get_icon(icon, image_type)

trunk/umit/gui/radialnet/RadialNet.py

@@ -672 +672 @@
                 x, y = point
 
-                if node in self.__node_views.keys():
+                if node in self.__node_views:
 
                     self.__node_views[node].restore(int(xw + x), int(yw + y))
@@ -1048 +1048 @@
             icons = list()
 
-            if type in ICON_DICT.keys():
+            if type in ICON_DICT:
                 icons.append(self.__icon.get_pixbuf(ICON_DICT[type]))
 

trunk/umit/inventory/DataGrabber.py

@@ -103 +103 @@
 
         # grab data
-        for category in categories.keys():
+        for category in categories:
             # unused is a filter that we will discard, it is a filter
             # for Changes Sum, but we will return a filter by category.

trunk/umit/inventory/InventoryLoad.py

@@ -90 +90 @@
 
         # Retrieve hosts for each Inventory
-        for inv in inv_data.keys():
+        for inv in inv_data:
             invid = self.get_inventory_id_for_name(inv)
 

trunk/umit/inventory/TLBarDisplay.py

@@ -144 +144 @@
 
         # grab changes by category in current selection
-        for key in categories.keys():
+        for key in categories:
             c = self.datagrabber.timerange_changes_count_generic(range_start,
                 range_end, key, self.datagrabber.inventory,

trunk/umit/inventory/TLChangesTree.py

@@ -151 +151 @@
         # grab changes in timerange
         self.datagrabber.use_dict_cursor()
-        for key in db_categories.keys():
+        for key in db_categories:
             if not range_start or not range_end:
                 data[key] = { }
@@ -178 +178 @@
 
                 # grab host address
-                if not fk_address in addresses.keys():
+                if not fk_address in addresses:
                     adr = self.datagrabber.get_address_for_address_id_from_db(
                           fk_address)
@@ -185 +185 @@
 
                 # grab inventory name
-                if not fk_inventory in inventories.keys():
+                if not fk_inventory in inventories:
                     inv_name = self.datagrabber.get_inventory_name_for_id(
                                fk_inventory)