Compatibility fix

vulners/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.3.5"
+__version__ = "1.3.6"
 
 from vulners.api import Vulners

vulners/api.py

@@ -13,6 +13,7 @@
 from six import string_types
 
 from .common.ratelimit import rate_limited
+from .common.attributeList import AttributeList
 from . import __version__ as api_version
 
 
@@ -310,7 +311,7 @@ def search(self, query, limit=100, offset=0, fields=("id", "title", "description
             total = max(results.get('total'), total)
             for element in results.get('search'):
                     dataDocs.append(element.get('_source'))
-        return dataDocs, total
+        return AttributeList(dataDocs, total = total)
 
     def searchPage(self, query, pageSize = 20, offset=0, fields=("id", "title", "description", "type", "bulletinFamily", "cvss", "published", "modified", "href")):
         """
@@ -326,7 +327,7 @@ def searchPage(self, query, pageSize = 20, offset=0, fields=("id", "title", "des
         results = self.__search(query, offset, min(pageSize, self.__search_size), fields or [])
         total = results.get('total')
         dataDocs = [element.get('_source') for element in results.get('search')]
-        return dataDocs, total
+        return AttributeList(dataDocs, total = total)
 
     def searchExploit(self, query, lookup_fields=None, limit=500, offset=0, fields=("id", "title", "description", "cvss", "href", "sourceData")):
         """
@@ -356,7 +357,8 @@ def searchExploit(self, query, lookup_fields=None, limit=500, offset=0, fields=(
             total = max(results.get('total'), total)
             for element in results.get('search'):
                 dataDocs.append(element.get('_source'))
-        return dataDocs, total
+        return AttributeList(dataDocs, total = total)
+
 
     def searchExploitPage(self, query, lookup_fields=None, pageSize=20, offset=0, fields=("id", "title", "description", "cvss", "href", "sourceData")):
         """
@@ -380,7 +382,8 @@ def searchExploitPage(self, query, lookup_fields=None, pageSize=20, offset=0, fi
         results = self.__search(searchQuery, offset, min(pageSize, self.__search_size), fields or [])
         total = results.get('total')
         dataDocs = [element.get('_source') for element in results.get('search')]
-        return dataDocs, total
+        return AttributeList(dataDocs, total = total)
+
 
     def softwareVulnerabilities(self, name, version, maxVulnerabilities = 50):
         """

vulners/common/attributeList.py

@@ -0,0 +1,39 @@
+class AttributeList(list):
+    """
+    A subclass of list that can accept additional attributes.
+    Should be able to be used just like a regular list.
+
+    The problem:
+    a = [1, 2, 4, 8]
+    a.x = "Hey!" # AttributeError: 'list' object has no attribute 'x'
+
+    The solution:
+    a = L(1, 2, 4, 8)
+    a.x = "Hey!"
+    print a       # [1, 2, 4, 8]
+    print a.x     # "Hey!"
+    print len(a)  # 4
+
+    You can also do these:
+    a = L( 1, 2, 4, 8 , x="Hey!" )                 # [1, 2, 4, 8]
+    a = L( 1, 2, 4, 8 )( x="Hey!" )                # [1, 2, 4, 8]
+    a = L( [1, 2, 4, 8] , x="Hey!" )               # [1, 2, 4, 8]
+    a = L( {1, 2, 4, 8} , x="Hey!" )               # [1, 2, 4, 8]
+    a = L( [2 ** b for b in range(4)] , x="Hey!" ) # [1, 2, 4, 8]
+    a = L( (2 ** b for b in range(4)) , x="Hey!" ) # [1, 2, 4, 8]
+    a = L( 2 ** b for b in range(4) )( x="Hey!" )  # [1, 2, 4, 8]
+    a = L( 2 )                                     # [2]
+    """
+    def __new__(self, *args, **kwargs):
+        return list.__new__(self, args, kwargs)
+
+    def __init__(self, *args, **kwargs):
+        if len(args) == 1 and hasattr(args[0], '__iter__'):
+            list.__init__(self, args[0])
+        else:
+            list.__init__(self, args)
+        self.__dict__.update(kwargs)
+
+    def __call__(self, **kwargs):
+        self.__dict__.update(kwargs)
+        return self