Make rpki.resource_set.resource_set.from_sql() into a class method.

Rework IRDB code.

svn path=/docs/rpki-db-schema.pdf; revision=1068

1 files changed, 5 insertions, 3 deletions

diff --git a/scripts/rpki/resource_set.py b/scripts/rpki/resource_set.py
index 45fa096e..b0de948b 100644
--- a/scripts/rpki/resource_set.py
+++ b/scripts/rpki/resource_set.py
@@ -208,15 +208,17 @@ class resource_set(list):
         assert isinstance(item, (type(i), type(i.min)))
     return False
 
-  def from_sql(self, cursor, query):
-    """Populate resource set from an SQL query.
+  @classmethod
+  def from_sql(cls, cursor, query):
+    """Create resource set from an SQL query.
 
     cursor is a DB API 2.0 cursor object.
 
     query is an SQL query that returns a sequence of (min, max) pairs.
     """
+
     cursor.execute(query)
-    self[:] = [self.range_type(b, e) for (b,e) in cursor.fetchall()]
+    return cls(ini = [cls.range_type(b, e) for (b,e) in cursor.fetchall()])
 
 class resource_set_as(resource_set):
   """ASN resource set."""