Fixed again the #355 bug
parent
e4def00dce
commit
58304d8fd9
|
@ -51,18 +51,19 @@ def save_in_bulk(instances, callback=None, precall=None, **save_options):
|
||||||
:params save_options: Additional options to use when saving each instance.
|
:params save_options: Additional options to use when saving each instance.
|
||||||
"""
|
"""
|
||||||
if callback is None:
|
if callback is None:
|
||||||
callback = functions.identity
|
callback = functions.noop
|
||||||
|
|
||||||
if precall is None:
|
if precall is None:
|
||||||
precall = functions.identity
|
precall = functions.noop
|
||||||
|
|
||||||
for instance in instances:
|
for instance in instances:
|
||||||
|
created = False
|
||||||
if instance.pk is None:
|
if instance.pk is None:
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
precall(instance)
|
precall(instance)
|
||||||
instance.save(**save_options)
|
instance.save(**save_options)
|
||||||
callback(instance)
|
callback(instance, created=created)
|
||||||
|
|
||||||
|
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
|
@ -74,9 +75,10 @@ def update_in_bulk(instances, list_of_new_values, callback=None, precall=None):
|
||||||
in the same index position as the dict.
|
in the same index position as the dict.
|
||||||
"""
|
"""
|
||||||
if callback is None:
|
if callback is None:
|
||||||
callback = functions.identity
|
callback = functions.noop
|
||||||
|
|
||||||
if precall is None:
|
if precall is None:
|
||||||
precall = functions.identity
|
precall = functions.noop
|
||||||
|
|
||||||
for instance, new_values in zip(instances, list_of_new_values):
|
for instance, new_values in zip(instances, list_of_new_values):
|
||||||
for attribute, value in new_values.items():
|
for attribute, value in new_values.items():
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
def identity(argument):
|
def noop(*args, **kwargs):
|
||||||
"""The identity function."""
|
"""The noop function."""
|
||||||
return argument
|
return None
|
||||||
|
|
Loading…
Reference in New Issue