Changeset 5566

Timestamp:

03/29/10 22:25:59 (3 years ago)

Author:

getxsick

Message:

Fix #198 for umit/core

Location:

trunk/umit/core

Files:

• NmapCommand.py (modified) (5 diffs)
• NmapParser.py (modified) (1 diff)
• SearchResult.py (modified) (2 diffs)
• UmitConf.py (modified) (5 diffs)

trunk/umit/core/NmapCommand.py

@@ -26 +26 @@
 import threading
 import tempfile
-from types import StringTypes
 
 from umit.core.NmapOptions import NmapOptions
@@ -112 +111 @@
 
     def get_command(self):
-        if type(self._command) == type(""):
+        if isinstance(self._command, basestring):
             return self._command.split()
         return self._command
@@ -127 +126 @@
 
     def _verify_output_options(self, command):
-        if type(command) == type([]):
+        if isinstance(command, list):
             command = " ".join(command)
 
@@ -167 +166 @@
 
     def _remove_double_space(self, command):
-        if type(command) == type([]):
+        if isinstance(command, list):
             command = " ".join(command)
 
@@ -349 +348 @@
             args, level = self.options[option_name]
 
-            if type(args) in StringTypes:
+            if isinstance(args, basestring):
                 args = [args]
 

trunk/umit/core/NmapParser.py

@@ -381 +381 @@
 
     def set_date(self, date):
-        if type(date) == type(int):
+        if isinstance(date, int):
             self.nmap['nmaprun']['start'] = date
         else:

trunk/umit/core/SearchResult.py

@@ -27 +27 @@
 from fnmatch import fnmatch
 from tempfile import mktemp
-from types import StringTypes
 
 from umit.core.UmitDB import UmitDB
@@ -287 +286 @@
         self.search_directory = search_directory
 
-        if type(file_extensions) in StringTypes:
+        if isinstance(file_extensions, basestring):
             self.file_extensions = file_extensions.split(";")
-        elif type(file_extensions) == type([]):
+        elif isinstance(file_extensions, list):
             self.file_extensions = file_extensions
         else:

trunk/umit/core/UmitConf.py

@@ -24 +24 @@
 import os
 
-from types import StringTypes
 from ConfigParser import NoSectionError, NoOptionError, DuplicateSectionError
 
@@ -118 +117 @@
 
     def set_file_extension(self, file_extension):
-        if type(file_extension) == type([]):
+        if isinstance(file_extension, list):
             self._set_it("file_extension", ";".join(file_extension))
-        elif type(file_extension) in StringTypes:
+        elif isinstance(file_extension, basestring):
             self._set_it("file_extension", file_extension)
 
@@ -127 +126 @@
 
     def set_save_time(self, save_time):
-        if type(save_time) == type([]):
+        if isinstance(save_time, list):
             self._set_it("save_time", ";".join(save_time))
-        elif type(save_time) in StringTypes:
+        elif isinstance(save_time, basestring):
             self._set_it("save_time", save_time)
 
@@ -342 +341 @@
 
         tuple_regex = "[\(\[]\s?(\d+)\s?,\s?(\d+)\s?,\s?(\d+)\s?[\)\]]"
-        if type(settings[3]) == type(""):
+        if isinstance(settings[3], basestring):
             settings[3] = [int(t) \
                            for t in re.findall(tuple_regex, settings[3])[0]]
 
-        if type(settings[4]) == type(""):
+        if isinstance(settings[4], basestring):
             settings[4]= [int(h) \
                           for h in re.findall(tuple_regex, settings[4])[0]]
@@ -520 +519 @@
         
         tuple_regex = "[\(\[]\s?(\d+)\s?,\s?(\d+)\s?,\s?(\d+)\s?[\)\]]"
-        if type(settings) == type(""):
+        if isinstance(settings, basestring):
             settings = [int(t) for t in re.findall(tuple_regex, settings)[0]]