Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21539 from edx/BOM-125

Browse Source 
BOM-125
This commit is contained in:
Aarif
2019-09-05 12:06:35 +05:00
committed by GitHub
parent cf91c28b8f 929d73bd88
commit e0500adc90
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/mobile_api/course_info/tests.py
View File

@@ -75,7 +75,7 @@ class TestUpdates(MobileAPITestCase, MobileAuthTestMixin, MobileCourseAccessTest
response = self.api_response(api_version=api_version)
# verify static URLs are replaced in the content returned by the API
self.assertNotIn("\"/static/", response.content)
self.assertNotIn("\"/static/", response.content.decode('utf-8'))
# verify static URLs remain in the underlying content
underlying_updates = modulestore().get_item(updates_usage_key)

2
openedx/core/lib/xblock_utils/__init__.py
View File

@@ -434,7 +434,7 @@ def get_course_update_items(course_updates, provided_index=0):
content = html_parsed[0].tail
else:
content = html_parsed[0].tail if html_parsed[0].tail is not None else ""
content += "\n".join([html.tostring(ele) for ele in html_parsed[1:]])
content += "\n".join([html.tostring(ele).decode('utf-8') for ele in html_parsed[1:]])
return content
if course_updates and getattr(course_updates, "items", None):