diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-16 12:00:45 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-16 12:00:45 +0100 |
| commit | 24b244f358c05645e1dd11266fe1db3c1da03a52 (patch) | |
| tree | c6f3d6d784e5186bebcbe22e47d2eb0fd7efe05e /chimere/tasks.py | |
| parent | 8ff3c1b6f1e7f41a3dfb373ea5bceb9f116603b9 (diff) | |
| parent | 8f854e8ca5c816ab58aacc04b4c360dba3de83ee (diff) | |
| download | Chimère-24b244f358c05645e1dd11266fe1db3c1da03a52.tar.bz2 Chimère-24b244f358c05645e1dd11266fe1db3c1da03a52.zip | |
Merge branch 'saclay'
Conflicts:
chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
chimere/migrations/0029_auto__add_propertymodelchoice.py
chimere/migrations/0030_auto__add_field_importer_default_name.py
chimere/migrations/0031_auto__add_field_subcategory_dated.py
chimere/migrations/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
chimere/migrations/0032_auto__add_field_subcategory_submission.py
chimere/migrations/0033_auto__add_field_importer_source_file.py
chimere/migrations/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
chimere/migrations/0035_area_permissions.py
chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
chimere/migrations/0036_auto.py
chimere/migrations/0036_auto__add_field_importer_default_name.py
chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
chimere/migrations/0038_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
chimere/migrations/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
chimere/migrations/0040_remove_excluded_status.py
chimere/migrations/0041_auto__add_field_importer_overwrite.py
chimere/migrations/0041_auto__add_field_importer_source_file.py
chimere/migrations/0042_auto__add_field_importer_origin__add_field_importer_license__add_field.py
chimere/migrations/0042_fix_rights.py
chimere/migrations/0043_area_permissions.py
chimere/migrations/0043_auto__add_field_importer_get_description.py
chimere/migrations/0044_auto.py
chimere/migrations/0044_auto__add_field_importer_default_description.py
chimere/migrations/0046_auto__del_field_subcategory_routing_available.py
chimere/migrations/0047_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
chimere/migrations/0049_auto__chg_field_multimediafile_multimedia_type.py
chimere/migrations/0050_remove_excluded_status.py
chimere/migrations/0051_auto__add_field_importer_overwrite.py
chimere/migrations/0054_fix_rights.py
chimere/old_migrations/v2.0/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
chimere/old_migrations/v2.0/0030_auto__add_field_importer_default_name.py
chimere/old_migrations/v2.0/0031_auto__chg_field_picturefile_width__chg_field_picturefile_height.py
chimere/old_migrations/v2.0/0032_auto__add_field_subcategory_submission.py
chimere/old_migrations/v2.0/0033_auto__add_field_importer_source_file.py
chimere/old_migrations/v2.0/0034_auto__add_field_importer_origin__add_field_importer_license__add_field.py
chimere/old_migrations/v2.0/0035_area_permissions.py
chimere/old_migrations/v2.0/0036_auto.py
chimere/old_migrations/v2.0/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py
chimere/old_migrations/v2.0/0038_osm_import_filtr.py
chimere/old_migrations/v2.0/0039_auto__add_multimediaextension__chg_field_multimediafile_multimedia_typ.py
chimere/old_migrations/v2.0/0040_remove_excluded_status.py
chimere/old_migrations/v2.0/0041_auto__add_field_importer_overwrite.py
chimere/old_migrations/v2.0/0042_fix_rights.py
chimere/old_migrations/v2.0/0043_auto__add_field_importer_get_description.py
chimere/old_migrations/v2.0/0044_auto__add_field_importer_default_description.py
Diffstat (limited to 'chimere/tasks.py')
| -rw-r--r-- | chimere/tasks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chimere/tasks.py b/chimere/tasks.py index a74dce8..02e32a4 100644 --- a/chimere/tasks.py +++ b/chimere/tasks.py @@ -33,7 +33,7 @@ from external_utils import OsmApi def single_instance_task(timeout): def task_exc(func): def wrapper(*args, **kwargs): - return func() + return func(*args, **kwargs) return wrapper return task_exc |