Merge pull request savon-noir#73 from Deedasmi/master

Small fixes - merged to master

Author: savon-noir

libnmap/objects/cpe.py

@@ -11,8 +11,6 @@ class CPE(object):
     """
     def __init__(self, cpestring):
         self._cpestring = cpestring
-        self.cpedict = {}
-
         zk = ['cpe', 'part', 'vendor', 'product', 'version',
               'update', 'edition', 'language']
         self._cpedict = dict((k, '') for k in zk)
@@ -26,6 +24,13 @@ def cpestring(self):
         """
         return self._cpestring
 
+    @property
+    def cpedict(self):
+        """
+            Accessor for _cpedict
+        """
+        return self._cpedict
+
     def __repr__(self):
         return self._cpestring
 

libnmap/objects/host.py

@@ -467,6 +467,9 @@ def extraports_reasons(self):
         """
         r = self._extras.get('extraports', {})
 
+        if r is None:
+            return None
+
         return r.get('reasons', None)
 
     def get_dict(self):

libnmap/objects/report.py

@@ -110,7 +110,7 @@ def scan_type(self):
 
             :return: string
         """
-        return self._scaninfo['type']
+        return self._scaninfo.get('type')
 
     @property
     def hosts(self):