Skip to content

Commit da5f383

Browse files
author
Matthew Fisher
committed
ref(controller): replace DATA with data
request.DATA is pending deprecation. It is recommended that we should use request.data instead. See https://github.com/tomchristie/django-rest-framework/blob/a7567efa8d6fd008ba0a48f0e8fa7028703af386/rest_framework/request.py#L239
1 parent d52b7c2 commit da5f383

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

controller/api/views.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ def get_object(self):
3737

3838
def passwd(self, request, **kwargs):
3939
obj = self.get_object()
40-
if not obj.check_password(request.DATA['password']):
40+
if not obj.check_password(request.data['password']):
4141
return Response({'detail': 'Current password does not match'},
4242
status=status.HTTP_400_BAD_REQUEST)
43-
obj.set_password(request.DATA['new_password'])
43+
obj.set_password(request.data['new_password'])
4444
obj.save()
4545
return Response({'status': 'password set'})
4646

@@ -80,7 +80,7 @@ def get_object(self, **kwargs):
8080
return self.get_queryset(**kwargs).latest('created')
8181

8282
def create(self, request, **kwargs):
83-
request.DATA['app'] = self.get_app()
83+
request.data['app'] = self.get_app()
8484
return super(AppResourceViewSet, self).create(request, **kwargs)
8585

8686

@@ -134,7 +134,7 @@ def scale(self, request, **kwargs):
134134
new_structure = {}
135135
app = self.get_object()
136136
try:
137-
for target, count in request.DATA.items():
137+
for target, count in request.data.items():
138138
new_structure[target] = int(count)
139139
models.validate_app_structure(new_structure)
140140
app.scale(request.user, new_structure)
@@ -160,7 +160,7 @@ def logs(self, request, **kwargs):
160160

161161
def run(self, request, **kwargs):
162162
app = self.get_object()
163-
command = request.DATA['command']
163+
command = request.data['command']
164164
try:
165165
output_and_rc = app.run(self.request.user, command)
166166
except EnvironmentError as e:
@@ -245,8 +245,8 @@ def rollback(self, request, **kwargs):
245245
app = self.get_app()
246246
release = app.release_set.latest()
247247
version_to_rollback_to = release.version - 1
248-
if request.DATA.get('version'):
249-
version_to_rollback_to = int(request.DATA['version'])
248+
if request.data.get('version'):
249+
version_to_rollback_to = int(request.data['version'])
250250
new_release = release.rollback(request.user, version_to_rollback_to)
251251
response = {'version': new_release.version}
252252
return Response(response, status=status.HTTP_201_CREATED)
@@ -318,8 +318,8 @@ class ConfigHookViewSet(BaseHookViewSet):
318318
serializer_class = serializers.ConfigSerializer
319319

320320
def create(self, request, *args, **kwargs):
321-
app = get_object_or_404(models.App, id=request.DATA['receive_repo'])
322-
user = get_object_or_404(User, username=request.DATA['receive_user'])
321+
app = get_object_or_404(models.App, id=request.data['receive_repo'])
322+
user = get_object_or_404(User, username=request.data['receive_user'])
323323
# check the user is authorized for this app
324324
if user == app.owner or \
325325
user in get_users_with_perms(app) or \
@@ -351,7 +351,7 @@ def create(self, request, **kwargs):
351351
app = get_object_or_404(self.model, id=kwargs['id'])
352352
if request.user != app.owner and not request.user.is_superuser:
353353
return Response(status=status.HTTP_403_FORBIDDEN)
354-
user = get_object_or_404(User, username=request.DATA['username'])
354+
user = get_object_or_404(User, username=request.data['username'])
355355
assign_perm(self.perm, user, app)
356356
models.log_event(app, "User {} was granted access to {}".format(user, app))
357357
return Response(status=status.HTTP_201_CREATED)
@@ -381,7 +381,7 @@ def get_queryset(self, **kwargs):
381381
return self.model.objects.filter(is_active=True, is_superuser=True)
382382

383383
def create(self, request, **kwargs):
384-
user = get_object_or_404(User, username=request.DATA['username'])
384+
user = get_object_or_404(User, username=request.data['username'])
385385
user.is_superuser = user.is_staff = True
386386
user.save(update_fields=['is_superuser', 'is_staff'])
387387
return Response(status=status.HTTP_201_CREATED)

0 commit comments

Comments
 (0)