4 files changed, 2 insertions, 51 deletions
diff --git a/rpkid/rpki/gui/app/forms.py b/rpkid/rpki/gui/app/forms.py
index a04119e1..e5ba0961 100644
--- a/rpkid/rpki/gui/app/forms.py
+++ b/rpkid/rpki/gui/app/forms.py
@@ -20,7 +20,7 @@ from django import forms
 
 import rpki.ipaddrs
 
-from rpki.gui.app import models, misc
+from rpki.gui.app import models
 
 class AddConfForm(forms.Form):
     handle = forms.CharField(required=True,
diff --git a/rpkid/rpki/gui/app/misc.py b/rpkid/rpki/gui/app/misc.py
deleted file mode 100644
index 5d3cba93..00000000
--- a/rpkid/rpki/gui/app/misc.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-"""
-Copyright (C) 2010  SPARTA, Inc. dba Cobham Analytic Solutions
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
-
-import rpki.resource_set
-import rpki.ipaddrs
-
-def str_to_range(lo, hi):
-    """Convert IP address strings to resource_range_ip."""
-    x = rpki.ipaddrs.parse(lo)
-    y = rpki.ipaddrs.parse(hi)
-    assert type(x) == type(y)
-    if isinstance(x, rpki.ipaddrs.v4addr):
-        return rpki.resource_set.resource_range_ipv4(x, y)
-    else:
-        return rpki.resource_set.resource_range_ipv6(x, y)
-
-def parse_resource_range(s):
-    '''Parse an IPv4/6 resource range.'''
-    # resource_set functions only accept str
-    if isinstance(s, unicode):
-        s = s.encode()
-    try:
-        return rpki.resource_set.resource_range_ipv4.parse_str(s)
-    except ValueError:
-        return rpki.resource_set.resource_range_ipv6.parse_str(s)
-
-def top_parent(prefix):
-    '''Returns the topmost resource from which the specified argument derives'''
-    while prefix.parent:
-        prefix = prefix.parent
-    return prefix
-
-# vim:sw=4 ts=8 expandtab
diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py
index 53a708e3..2722d604 100644
--- a/rpkid/rpki/gui/app/models.py
+++ b/rpkid/rpki/gui/app/models.py
@@ -21,8 +21,6 @@ import socket
 from django.db import models
 from django.contrib.auth.models import User
 
-from rpki.gui.app.misc import str_to_range
-
 import rpki.resource_set
 import rpki.exceptions
 import rpki.irdb.models
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index fcf262df..db487480 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -33,7 +33,7 @@ from django.views.generic.list_detail import object_list, object_detail
 from django.views.generic.create_update import delete_object, update_object, create_object
 from django.core.urlresolvers import reverse
 
-from rpki.gui.app import models, forms, glue, misc, settings
+from rpki.gui.app import models, forms, glue, settings
 from rpki import resource_set
 import rpki.irdb
 import rpki.exceptions