From da2f1560f4c2a1f90202ee7d57913335cb62be79 Mon Sep 17 00:00:00 2001 From: Joseph Kennedy Date: Fri, 25 Aug 2017 23:50:55 -0400 Subject: [PATCH] Remove extraneous line and remove try for error testing --- netbox/dcim/forms.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 9d56f52bd..bf9b5a885 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1597,18 +1597,13 @@ class InterfaceCSVForm(forms.ModelForm): def clean_lag(self): - try: - if device is not None: - interface_ordering = device.device_type.interface_ordering - lag = Interface.objects.order_naturally(method=interface_ordering).filter( - device=device, form_factor=IFACE_FF_LAG).get( - lag=self.cleaned_data['lag'], name=lag - ) - self.fields['lag'].queryset = Interface.objects.order_naturally(method=interface_ordering).filter( - device=device, form_factor=IFACE_FF_LAG - ) - except: - return None + if device is not None: + interface_ordering = device.device_type.interface_ordering + lag = Interface.objects.order_naturally(method=interface_ordering).filter( + device=device, form_factor=IFACE_FF_LAG).get( + lag=self.cleaned_data['lag'], name=lag + ) + if not lag: return None