Skip to content

Commit 4f50585

Browse files
committed
[Django 3.0] ImportError: cannot import name 'curry' from 'django.utils.functional'
1 parent d111ce8 commit 4f50585

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

apps/filebrowser/src/filebrowser/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from django.views.decorators.http import require_http_methods
4242
from django.views.static import was_modified_since
4343
from django.shortcuts import redirect
44-
from django.utils.functional import curry
44+
from functools import partial
4545
from django.utils.http import http_date
4646
from django.utils.html import escape
4747
from django.utils.translation import ugettext as _
@@ -1273,7 +1273,7 @@ def chmod(request):
12731273
"other_read", "other_write", "other_execute"]
12741274
params = ["path"]
12751275
def bulk_chmod(*args, **kwargs):
1276-
op = curry(request.fs.chmod, recursive=request.POST.get('recursive', False))
1276+
op = partial(request.fs.chmod, recursive=request.POST.get('recursive', False))
12771277
for arg in args:
12781278
op(urllib_unquote(arg['path']), arg['mode'])
12791279
# mode here is abused: on input, it's a string, but when retrieved,
@@ -1298,7 +1298,7 @@ def chown(request):
12981298
recurring = ["user", "group", "user_other", "group_other"]
12991299
params = ["path"]
13001300
def bulk_chown(*args, **kwargs):
1301-
op = curry(request.fs.chown, recursive=request.POST.get('recursive', False))
1301+
op = partial(request.fs.chown, recursive=request.POST.get('recursive', False))
13021302
for arg in args:
13031303
varg = [urllib_unquote(arg[param]) for param in param_names]
13041304
op(*varg)

apps/oozie/src/oozie/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from django import forms
2424
from django.core.exceptions import ValidationError
2525
from django.forms.widgets import TextInput
26-
from django.utils.functional import curry
26+
from functools import partial
2727
from django.utils.translation import ugettext_lazy as _t
2828

2929
from desktop.lib.django_forms import MultiForm, SplitDateTimeWidget
@@ -574,7 +574,7 @@ def design_form_by_type(node_type, user, workflow):
574574
klass_form = _node_type_TO_FORM_CLS[node_type]
575575

576576
if node_type == 'subworkflow':
577-
klass_form = curry(klass_form, user=user, workflow=workflow)
577+
klass_form = partial(klass_form, user=user, workflow=workflow)
578578

579579
return klass_form
580580

apps/oozie/src/oozie/views/editor.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from django.http import HttpResponse
2929
from django.shortcuts import redirect
3030
from django.template.defaultfilters import strip_tags
31-
from django.utils.functional import curry
31+
from functools import partial
3232
from django.utils.http import http_date
3333
from django.utils.translation import ugettext as _, activate as activate_translation
3434

@@ -475,17 +475,17 @@ def edit_coordinator(request, coordinator):
475475

476476
DatasetFormSet = inlineformset_factory(Coordinator, Dataset, form=DatasetForm, max_num=0, can_order=False, can_delete=True)
477477
DataInputFormSet = inlineformset_factory(Coordinator, DataInput, form=DataInputForm, max_num=0, can_order=False, can_delete=True)
478-
DataInputFormSet.form = staticmethod(curry(DataInputForm, coordinator=coordinator))
478+
DataInputFormSet.form = staticmethod(partial(DataInputForm, coordinator=coordinator))
479479
DataOutputFormSet = inlineformset_factory(Coordinator, DataOutput, form=DataOutputForm, max_num=0, can_order=False, can_delete=True)
480-
DataOutputFormSet.form = staticmethod(curry(DataOutputForm, coordinator=coordinator))
480+
DataOutputFormSet.form = staticmethod(partial(DataOutputForm, coordinator=coordinator))
481481

482482
dataset = Dataset(coordinator=coordinator)
483483
dataset_form = DatasetForm(instance=dataset, prefix='create')
484484

485485
NewDataInputFormSet = inlineformset_factory(Coordinator, DataInput, form=DataInputForm, extra=0, can_order=False, can_delete=False)
486-
NewDataInputFormSet.form = staticmethod(curry(DataInputForm, coordinator=coordinator))
486+
NewDataInputFormSet.form = staticmethod(partial(DataInputForm, coordinator=coordinator))
487487
NewDataOutputFormSet = inlineformset_factory(Coordinator, DataOutput, form=DataOutputForm, extra=0, can_order=False, can_delete=False)
488-
NewDataOutputFormSet.form = staticmethod(curry(DataOutputForm, coordinator=coordinator))
488+
NewDataOutputFormSet.form = staticmethod(partial(DataOutputForm, coordinator=coordinator))
489489

490490
enable_cron_scheduling = ENABLE_CRON_SCHEDULING.get()
491491

0 commit comments

Comments
 (0)