Merge branch 'develop' into feature

This commit is contained in:
Jeremy Stretch
2023-07-30 13:36:51 -04:00
5 changed files with 51 additions and 51 deletions

View File

@@ -123,9 +123,9 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
records = []
try:
for data in yaml.load_all(data, Loader=yaml.SafeLoader):
if type(data) == list:
if type(data) is list:
records.extend(data)
elif type(data) == dict:
elif type(data) is dict:
records.append(data)
else:
raise forms.ValidationError({

View File

@@ -114,7 +114,7 @@ def annotated_date(date_value):
if not date_value:
return ''
if type(date_value) == datetime.date:
if type(date_value) is datetime.date:
long_ts = date(date_value, 'DATE_FORMAT')
short_ts = date(date_value, 'SHORT_DATE_FORMAT')
else: