Skip to content

Commit bed2a15

Browse files
committed
simplify coercion from datetime.date to str in es_update --start
#39 es_update start flag broken
1 parent 958ea7f commit bed2a15

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

django_elastic_migrations/models.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -957,22 +957,18 @@ def __init__(self, *args, **kwargs):
957957
actual_val = kwargs.pop(kwarg_name, default_val)
958958
setattr(self, kwarg_name, actual_val)
959959
if actual_val != default_val:
960-
self.self_kwargs[kwarg_name] = actual_val
960+
if kwarg_name == 'start_date':
961+
self.self_kwargs['start_date'] = str(actual_val)
962+
else:
963+
self.self_kwargs[kwarg_name] = actual_val
961964

962965
if NewerModeMixin.MODE_NAME in kwargs:
963966
self.self_kwargs[NewerModeMixin.MODE_NAME] = True
964967

965968
super(UpdateIndexAction, self).__init__(*args, **kwargs)
966969
if self.task_kwargs == '{}' and self.self_kwargs:
967970
# retain a history of how this command was called
968-
try:
969-
self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
970-
except TypeError as e:
971-
if 'Object of type datetime is not JSON serializable' in str(e):
972-
for key, val in self.self_kwargs.items():
973-
if isinstance(val, datetime.date):
974-
self.self_kwargs[key] = str(val)
975-
self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
971+
self.task_kwargs = json.dumps(self.self_kwargs, sort_keys=True)
976972

977973
self._batch_num = 0
978974
self._expected_remaining = 0

0 commit comments

Comments
 (0)