Cleanup.

svn path=/branches/tk274/; revision=4772

1 files changed, 0 insertions, 21 deletions

diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py
index 80fc9ecd..c39d9059 100644
--- a/rpkid/rpki/resource_set.py
+++ b/rpkid/rpki/resource_set.py
@@ -569,11 +569,6 @@ class resource_set_ipv4(resource_set_ip):
 
   range_type = resource_range_ipv4
 
-  ## @var afi
-  # Address Family Identifier value for IPv4.
-
-  afi = "\x00\x01"
-
 class resource_set_ipv6(resource_set_ip):
   """
   IPv6 address resource set.
@@ -584,11 +579,6 @@ class resource_set_ipv6(resource_set_ip):
 
   range_type = resource_range_ipv6
 
-  ## @var afi
-  # Address Family Identifier value for IPv6.
-
-  afi = "\x00\x02"
-
 class resource_bag(object):
   """
   Container to simplify passing around the usual triple of ASN, IPv4,
@@ -960,17 +950,6 @@ class roa_prefix_set(list):
     return cls([cls.prefix_type(cls.prefix_type.range_type.datum_type(x), int(y), int(z))
                 for (x, y, z) in iterable])
 
-
-  def to_roa_tuple(self):
-    """
-    Convert ROA prefix set into tuple format used by ROA ASN.1
-    encoder.  This is a variation on the format used in RFC 3779.
-    """
-    if self:
-      return (self.resource_set_type.afi, tuple(a.to_roa_tuple() for a in self))
-    else:
-      return None
-
   def to_POW_roa_tuple(self):
     """
     Convert ROA prefix set to form used by rpki.POW.ROA.setPrefixes().