Skip to content

Commit 8d6dcde

Browse files
committed
fix ModelEntry.from_entry and ModelEntry.__repr__ behavior
1 parent bb6bc10 commit 8d6dcde

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

djcelery/schedulers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ def from_entry(cls, name, skip_fields=('relative', 'options'), **entry):
120120
fields.pop(skip_field, None)
121121
schedule = fields.pop('schedule')
122122
model_schedule, model_field = cls.to_model_schedule(schedule)
123+
124+
# reset schedule
125+
for t in cls.model_schedules:
126+
fields[t[2]] = None
127+
123128
fields[model_field] = model_schedule
124129
fields['args'] = dumps(fields.get('args') or [])
125130
fields['kwargs'] = dumps(fields.get('kwargs') or {})
@@ -131,7 +136,7 @@ def from_entry(cls, name, skip_fields=('relative', 'options'), **entry):
131136
))
132137

133138
def __repr__(self):
134-
return '<ModelEntry: {0} {1}(*{2}, **{3}) {{4}}>'.format(
139+
return '<ModelEntry: {0} {1}(*{2}, **{3}) {4}>'.format(
135140
safe_str(self.name), self.task, safe_repr(self.args),
136141
safe_repr(self.kwargs), self.schedule,
137142
)

0 commit comments

Comments
 (0)