Skip to content

Commit

Permalink
Update more FieldDoesNotExist imports as per #5581
Browse files Browse the repository at this point in the history
  • Loading branch information
gasman committed Sep 29, 2019
1 parent 44a1e6f commit 43cce16
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions wagtail/search/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _has_field(cls, name):
try:
cls._meta.get_field(name)
return True
except models.fields.FieldDoesNotExist:
except FieldDoesNotExist:
return hasattr(cls, name)

@classmethod
Expand Down Expand Up @@ -182,14 +182,14 @@ def get_attname(self, cls):
try:
field = self.get_field(cls)
return field.attname
except models.fields.FieldDoesNotExist:
except FieldDoesNotExist:
return self.field_name

def get_definition_model(self, cls):
try:
field = self.get_field(cls)
return field.model
except models.fields.FieldDoesNotExist:
except FieldDoesNotExist:
# Find where it was defined by walking the inheritance tree
for base_cls in inspect.getmro(cls):
if self.field_name in base_cls.__dict__:
Expand All @@ -213,7 +213,7 @@ def get_type(self, cls):

return field.get_internal_type()

except models.fields.FieldDoesNotExist:
except FieldDoesNotExist:
return 'CharField'

def get_value(self, obj):
Expand All @@ -240,7 +240,7 @@ def get_value(self, obj):
if hasattr(remote_field, 'get_searchable_content'):
value = remote_field.get_searchable_content(value)
return value
except models.fields.FieldDoesNotExist:
except FieldDoesNotExist:
value = getattr(obj, self.field_name, None)
if hasattr(value, '__call__'):
value = value()
Expand Down

0 comments on commit 43cce16

Please sign in to comment.