From 164141def9dc8c2879b6ddae34772b1d98629da3 Mon Sep 17 00:00:00 2001 From: aarif Date: Thu, 10 Oct 2019 13:57:43 +0500 Subject: [PATCH] replaced json.loads with a util to handle bytes changes made to fix jenkins/quality errors changes made as suggested added the docstring to fix quality issue made a few changes to fix some tests replaced json.loads with a util to handle bytes changes made to fix jenkins/quality errors changes made as suggested added the docstring to fix quality issue made a few changes to fix some tests made changes as suggested made changes as suggested updated the requirements with make upgrade --- .../lib/xmodule/xmodule/video_module/transcripts_utils.py | 2 +- lms/djangoapps/courseware/tests/test_video_handlers.py | 2 +- lms/djangoapps/verify_student/tests/test_views.py | 4 ++-- requirements/edx/base.in | 1 + requirements/edx/base.txt | 8 ++++---- requirements/edx/development.txt | 6 +++--- requirements/edx/testing.txt | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py index a293595819..5009feb497 100644 --- a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py +++ b/common/lib/xmodule/xmodule/video_module/transcripts_utils.py @@ -5,7 +5,7 @@ Utility functions for transcripts. from __future__ import absolute_import import copy -import json +import simplejson as json import logging import os from functools import wraps diff --git a/lms/djangoapps/courseware/tests/test_video_handlers.py b/lms/djangoapps/courseware/tests/test_video_handlers.py index 519a789bf2..ace597aaad 100644 --- a/lms/djangoapps/courseware/tests/test_video_handlers.py +++ b/lms/djangoapps/courseware/tests/test_video_handlers.py @@ -416,7 +416,7 @@ class TestTranscriptAvailableTranslationsBumperDispatch(TestVideo): request = Request.blank('/' + self.dispatch) response = self.item.transcript(request=request, dispatch=self.dispatch) - self.assertEqual(json.loads(response.body.decode('utf-8')), [lang]) + self.assertEqual(json.loads(response.body), [lang]) @patch('xmodule.video_module.transcripts_utils.get_available_transcript_languages') def test_multiple_available_translations(self, mock_get_transcript_languages): diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py index 483f4124e4..730f201bb8 100644 --- a/lms/djangoapps/verify_student/tests/test_views.py +++ b/lms/djangoapps/verify_student/tests/test_views.py @@ -5,7 +5,7 @@ Tests of verify_student views. from __future__ import absolute_import -import json +import simplejson as json from datetime import timedelta from uuid import uuid4 @@ -1637,7 +1637,7 @@ class TestSubmitPhotosForVerification(TestCase): def _get_post_data(self): """Retrieve POST data from the last request. """ last_request = moto.packages.httpretty.last_request() - return json.loads(last_request.body.decode('utf-8')) + return json.loads(last_request.body) class TestPhotoVerificationResultsCallback(ModuleStoreTestCase): diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 9d53532d7f..fdbf3a175a 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -140,6 +140,7 @@ redis==2.10.6 # celery task broker requests-oauthlib # Simplifies use of OAuth via the requests library, used for CCX and LTI random2 rules # Django extension for rules-based authorization checks +simplejson sailthru-client==2.2.3 # For Sailthru integration Shapely # Geometry library, used for image click regions in capa six # Utilities for supporting Python 2 & 3 in the same codebase diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 116dcdba33..7f6641da69 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -106,7 +106,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 -edx-enterprise==2.0.4 +edx-enterprise==2.0.5 edx-i18n-tools==0.4.8 edx-milestones==0.2.3 edx-oauth2-provider==1.3.1 @@ -208,7 +208,7 @@ pytz==2019.3 pyuca==1.1 pyyaml==5.1.2 random2==1.0.1 -recommender-xblock==1.4.4 +recommender-xblock==1.4.5 redis==2.10.6 requests-oauthlib==1.1.0 requests==2.22.0 @@ -224,7 +224,7 @@ scipy==1.2.1 semantic-version==2.8.2 # via edx-drf-extensions shapely==1.6.4.post2 shortuuid==0.5.0 # via edx-django-oauth2-provider -simplejson==3.16.0 # via mailsnake, sailthru-client +simplejson==3.16.0 singledispatch==3.4.0.3 six==1.12.0 slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client @@ -254,7 +254,7 @@ wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1 xblock-utils==1.2.2 -xblock==1.2.6 +xblock==1.2.7 xmlsec==1.3.3 # via python3-saml xss-utils==0.1.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 400aaf88d0..89b3fd8a11 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -129,7 +129,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 -edx-enterprise==2.0.4 +edx-enterprise==2.0.5 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 @@ -280,7 +280,7 @@ pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 random2==1.0.1 -recommender-xblock==1.4.4 +recommender-xblock==1.4.5 recommonmark==0.6.0 redis==2.10.6 requests-oauthlib==1.1.0 @@ -343,7 +343,7 @@ wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1 xblock-utils==1.2.2 -xblock==1.2.6 +xblock==1.2.7 xmlsec==1.3.3 xmltodict==0.12.0 xss-utils==0.1.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 87b92ce209..58351e6520 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -125,7 +125,7 @@ edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 -edx-enterprise==2.0.4 +edx-enterprise==2.0.5 edx-i18n-tools==0.4.8 edx-lint==1.3.0 edx-milestones==0.2.3 @@ -271,7 +271,7 @@ pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 random2==1.0.1 -recommender-xblock==1.4.4 +recommender-xblock==1.4.5 redis==2.10.6 requests-oauthlib==1.1.0 requests==2.22.0 @@ -329,7 +329,7 @@ wrapt==1.10.5 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.6#egg=xblock-drag-and-drop-v2==2.2.6 git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1 xblock-utils==1.2.2 -xblock==1.2.6 +xblock==1.2.7 xmlsec==1.3.3 xmltodict==0.12.0 # via moto xss-utils==0.1.1