weed dead code

svn path=/portal-gui/rpkigui/myrpki/forms.py; revision=3343

2 files changed, 4 insertions, 146 deletions

diff --git a/portal-gui/rpkigui/myrpki/forms.py b/portal-gui/rpkigui/myrpki/forms.py
index c4338de6..42dbceba 100644
--- a/portal-gui/rpkigui/myrpki/forms.py
+++ b/portal-gui/rpkigui/myrpki/forms.py
@@ -5,20 +5,6 @@ import models
 from rpkigui.myrpki.misc import str_to_addr
 from rpkigui.myrpki.asnset import asnset
 
-def ConfCertForm(request):
-    class CertForm(forms.ModelForm):
-        class Meta:
-            model = models.Cert
-            exclude = ('conf')
-
-        def save(self):
-            obj = forms.ModelForm.save(self, commit=False)
-            obj.conf = request.session['handle']
-            obj.save()
-            return obj
-
-    return CertForm
-
 class AddConfForm(forms.Form):
     handle = forms.CharField(required=True,
             help_text='your handle for your rpki instance')
@@ -46,135 +32,6 @@ class ImportForm(forms.Form):
     handle = forms.CharField()
     xml = forms.FileField()
 
-class ChildImportForm(ImportForm):
-    validity = forms.DateTimeField(help_text='YYYY-MM-DD')
-
-def RangeForm(field_type, *args, **kwargs):
-    '''Generic form with an upper and lower bound.'''
-    class wrapped(forms.Form):
-        lo = field_type(label='Lower Bound')
-        hi = field_type(label='Upper Bound')
-
-        def __init__(self, *inargs, **inkwargs):
-            forms.Form.__init__(self, *inargs, **inkwargs)
-
-        def clean(self):
-            lo = self.cleaned_data.get('lo')
-            hi = self.cleaned_data.get('hi')
-            if lo > hi:
-                # should we just fix it?
-                raise forms.ValidationError, \
-                        'Lower bound is higher than upper.'
-            return self.cleaned_data
-
-    return wrapped(*args, **kwargs)
-
-def AddressRangeForm(*args, **kwargs):
-    '''Form used for entering address ranges.'''
-    return RangeForm(forms.IPAddressField, *args, **kwargs)
-
-class AsnField(forms.IntegerField):
-    def __init__(self, *args, **kwargs):
-        forms.IntegerField.__init__(self, *args, **kwargs)
-
-    def clean(self, val):
-        val = super(AsnField, self).clean(val)
-        if val < 0:
-            raise forms.ValidationError, 'Value out of range.'
-        return val
-
-def AsnRangeForm(*args, **kwargs):
-    '''Form used for entering asn ranges.'''
-    return RangeForm(AsnField, *args, **kwargs)
-    
-def get_pk(child):
-    '''return the primary key or None if child is None'''
-    return child.pk if child else None
-
-def SubOrAssignForm(handle, addr, field_type, *args, **kwargs):
-    '''Closure to select child of the specified handle.'''
-    class Wrapper(forms.Form):
-        '''Form for the address view to allow the user to subdivide or
-        assign the block to a child.'''
-        lo = field_type(required=False, label='Lower bound')
-        hi = field_type(required=False, label='Upper bound')
-        child = forms.ModelChoiceField(required=False, label='Assign to child',
-                initial=get_pk(addr.allocated), queryset=handle.children.all())
-
-        def clean_lo(self):
-            '''validate the self.lo field to ensure it is within the
-            parent's range.'''
-            lo = self.cleaned_data['lo']
-            if lo == '':
-                lo = None
-            if lo != None:
-                if lo < addr.lo or lo > addr.hi:
-                    raise forms.ValidationError, \
-                            'Value is out of range of parent.'
-                # ensure there is no overlap with other children
-                for c in addr.children.all():
-                    if lo >= c.lo and lo <= c.hi:
-                        raise forms.ValidationError, \
-                                'Value overlaps another suballocation.'
-            return lo
-
-        def clean_hi(self):
-            '''validate the self.hi field to ensure it is within the
-            parent's range.'''
-            hi = self.cleaned_data['hi']
-            if hi == '':
-                hi = None
-            if hi != None:
-                if hi < addr.lo or hi > addr.hi:
-                    raise forms.ValidationError, \
-                        'Value is out of range of parent.'
-                # ensure there is no overlap with other children
-                for c in addr.children.all():
-                    if hi >= c.lo and hi <= c.hi:
-                        raise forms.ValidationError, \
-                                'Value overlaps another suballocation.'
-            return hi
-
-        def clean_child(self):
-            if self.cleaned_data['child'] and addr.children.count():
-                raise forms.ValidationError, \
-                        "Can't allocate a subdivided address."
-            return self.cleaned_data['child']
-
-        def clean(self):
-            clean_data = self.cleaned_data
-            child = clean_data.get('child')
-            lo = clean_data.get('lo')
-            hi = clean_data.get('hi')
-            loset = lo != '' and lo != None
-            hiset = hi != '' and hi != None
-            if (child and (loset or hiset)):
-                raise forms.ValidationError, \
-                        'Either a range or a child must be set, but not both.'
-            elif (lo and not hi) or (hi and not lo):
-                raise forms.ValidationError, \
-                        'Both a high and low range must be specified.'
-            return clean_data
-
-    return Wrapper(*args, **kwargs)
-
-def SubOrAssignAddressForm(handle, addr, *args, **kwargs):
-    return SubOrAssignForm(handle, addr, forms.IPAddressField, *args, **kwargs)
-
-def SubOrAssignAsnForm(handle, asn, *args, **kwargs):
-    return SubOrAssignForm(handle, asn, forms.IntegerField, *args, **kwargs)
-
-def RoaForm(handle, pk=None, initval=[], *args, **kwargs):
-    vals = models.AddressRange.objects.filter(
-            from_parent__in=handle.parents.all())
-
-    class Wrapped(forms.Form):
-        asn = AsnField(initial=pk)
-        prefix = forms.ModelMultipleChoiceField(label='Prefixes',
-                queryset=vals, initial=initval)
-
-    return Wrapped(*args, **kwargs)
-
 def PrefixSplitForm(prefix, *args, **kwargs):
     class _wrapper(forms.Form):
         lo = forms.IPAddressField()
@@ -240,7 +97,8 @@ def PrefixRoaForm(prefix, *args, **kwargs):
     prefix_range = prefix.as_resource_range()
 
     class _wrapper(forms.Form):
-        asns = forms.CharField(max_length=200, required=False, help_text='Comma-separated list of ASNs')
+        asns = forms.CharField(max_length=200, required=False,
+                help_text='Comma-separated list of ASNs')
         max_length = forms.IntegerField(required=False,
                 min_value=prefix_range._prefixlen(),
                 max_value=prefix_range.datum_type.bits)
diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py
index 24e095f4..01975c26 100644
--- a/portal-gui/rpkigui/myrpki/views.py
+++ b/portal-gui/rpkigui/myrpki/views.py
@@ -220,7 +220,7 @@ def parent_view(request, parent_handle):
 def child_import(request):
     handle = request.session['handle'].handle
     if request.method == 'POST':
-        form = forms.ChildImportForm(request.POST, request.FILES)
+        form = forms.ImportForm(request.POST, request.FILES)
         if form.is_valid():
             input_file = tempfile.NamedTemporaryFile(delete=False)
             try:
@@ -245,7 +245,7 @@ def child_import(request):
         else:
             print 'invalid form'
     else:
-        form = forms.ChildImportForm()
+        form = forms.ImportForm()
     return render('myrpki/xml_import.html',
             { 'form': form, 'kind': 'child',
                 'post_url': '/myrpki/import/child'}, request)