NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 11:26:26 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

py3.5 compatibility

Browse Source
This commit is contained in:
John Anderson 2020-02-09 21:32:45 -05:00
parent f08ac5c4fd
commit b7aff902bd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/utilities/filters.py
View File

@ -178,13 +178,15 @@ class BaseFilterSet(django_filters.FilterSet):
For specific filter types, new filters are created based on defined lookup expressions in For specific filter types, new filters are created based on defined lookup expressions in
the form `<field_name>__<lookup_expr>` the form `<field_name>__<lookup_expr>`
""" """
filters = super().get_filters() # TODO: once 3.6 is the minimum required version of python, change this to a bare super() call
# We have to do it this way in py3.5 becuase of django_filters.FilterSet's use of a metaclass
filters = super(django_filters.FilterSet, cls).get_filters()
new_filters = {} new_filters = {}
for existing_filter_name, existing_filter in filters.items(): for existing_filter_name, existing_filter in filters.items():
# Loop over existing filters to extract metadata by which to create new filters # Loop over existing filters to extract metadata by which to create new filters
# It the filter makes use of a custom filter method or lookup expression skip it # If the filter makes use of a custom filter method or lookup expression skip it
# as we cannot sanely handle these cases in a generic mannor # as we cannot sanely handle these cases in a generic mannor
if existing_filter.method is not None or existing_filter.lookup_expr not in ['exact', 'in']: if existing_filter.method is not None or existing_filter.lookup_expr not in ['exact', 'in']:
continue continue
@ -232,6 +234,9 @@ class BaseFilterSet(django_filters.FilterSet):
try: try:
if existing_filter_name in cls.declared_filters: if existing_filter_name in cls.declared_filters:
# The filter field has been explicity defined on the filterset class so we must manually
# create the new filter with the same type because there is no guarantee the defined type
# is the same as the default type for the field
resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid
new_filter = type(existing_filter)( new_filter = type(existing_filter)(
field_name=field_name, field_name=field_name,
@ -242,13 +247,14 @@ class BaseFilterSet(django_filters.FilterSet):
**existing_filter.extra **existing_filter.extra
) )
else: else:
# The filter field is listed in Meta.fields so we can safely rely on default behaviour
new_filter = cls.filter_for_field(field, field_name, lookup_expr) new_filter = cls.filter_for_field(field, field_name, lookup_expr)
except django_filters.exceptions.FieldLookupError: except django_filters.exceptions.FieldLookupError:
# The filter could not be created because the lookup expression is not supported on the field # The filter could not be created because the lookup expression is not supported on the field
continue continue
if lookup_name.startswith('n'): if lookup_name.startswith('n'):
# This is a negation filter which requires a queryselt.exclud() clause # This is a negation filter which requires a queryset.exclude() clause
new_filter.exclude = True new_filter.exclude = True
new_filters[new_filter_name] = new_filter new_filters[new_filter_name] = new_filter