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

BOM-349

Browse Source 
Fixing python3
This commit is contained in:
arbisoft
2019-08-29 23:26:41 +05:00
parent f365bd888d
commit bcf1e781e2
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/tests/test_contentstore.py
View File

@@ -679,7 +679,7 @@ class MiscCourseTests(ContentStoreTestCase):
self.assertEqual(resp.status_code, 200)
for expected in expected_types:
self.assertIn(expected, resp.content)
self.assertIn(expected, resp.content.decode('utf-8'))
@ddt.data("<script>alert(1)</script>", "alert('hi')", "</script><script>alert(1)</script>")
def test_container_handler_xss_prevent(self, malicious_code):

3
cms/djangoapps/contentstore/views/helpers.py
View File

@@ -4,7 +4,6 @@ Helper methods for Studio views.
from __future__ import absolute_import
import urllib
from uuid import uuid4
import six
@@ -112,7 +111,7 @@ def xblock_studio_url(xblock, parent_xblock=None):
elif category in ('chapter', 'sequential'):
return u'{url}?show={usage_key}'.format(
url=reverse_course_url('course_handler', xblock.location.course_key),
usage_key=urllib.quote(unicode(xblock.location))
usage_key=six.moves.urllib.parse.quote(six.text_type(xblock.location))
)
elif category == 'library':
library_key = xblock.location.course_key

41
cms/templates/widgets/header.html
View File

@@ -1,6 +1,7 @@
<%page expression_filter="h" args="online_help_token"/>
<%namespace name='static' file='../static_content.html'/>
<%!
import six
from django.conf import settings
from django.urls import reverse
from django.utils.translation import ugettext as _
@@ -19,22 +20,22 @@
% if context_course:
<%
course_key = context_course.id
index_url = reverse('course_handler', kwargs={'course_key_string': unicode(course_key)})
course_team_url = reverse('course_team_handler', kwargs={'course_key_string': unicode(course_key)})
assets_url = reverse('assets_handler', kwargs={'course_key_string': unicode(course_key)})
textbooks_url = reverse('textbooks_list_handler', kwargs={'course_key_string': unicode(course_key)})
videos_url = reverse('videos_handler', kwargs={'course_key_string': unicode(course_key)})
import_url = reverse('import_handler', kwargs={'course_key_string': unicode(course_key)})
course_info_url = reverse('course_info_handler', kwargs={'course_key_string': unicode(course_key)})
export_url = reverse('export_handler', kwargs={'course_key_string': unicode(course_key)})
settings_url = reverse('settings_handler', kwargs={'course_key_string': unicode(course_key)})
grading_url = reverse('grading_handler', kwargs={'course_key_string': unicode(course_key)})
advanced_settings_url = reverse('advanced_settings_handler', kwargs={'course_key_string': unicode(course_key)})
tabs_url = reverse('tabs_handler', kwargs={'course_key_string': unicode(course_key)})
index_url = reverse('course_handler', kwargs={'course_key_string': six.text_type(course_key)})
course_team_url = reverse('course_team_handler', kwargs={'course_key_string': six.text_type(course_key)})
assets_url = reverse('assets_handler', kwargs={'course_key_string': six.text_type(course_key)})
textbooks_url = reverse('textbooks_list_handler', kwargs={'course_key_string': six.text_type(course_key)})
videos_url = reverse('videos_handler', kwargs={'course_key_string': six.text_type(course_key)})
import_url = reverse('import_handler', kwargs={'course_key_string': six.text_type(course_key)})
course_info_url = reverse('course_info_handler', kwargs={'course_key_string': six.text_type(course_key)})
export_url = reverse('export_handler', kwargs={'course_key_string': six.text_type(course_key)})
settings_url = reverse('settings_handler', kwargs={'course_key_string': six.text_type(course_key)})
grading_url = reverse('grading_handler', kwargs={'course_key_string': six.text_type(course_key)})
advanced_settings_url = reverse('advanced_settings_handler', kwargs={'course_key_string': six.text_type(course_key)})
tabs_url = reverse('tabs_handler', kwargs={'course_key_string': six.text_type(course_key)})
certificates_url = ''
if settings.FEATURES.get("CERTIFICATES_HTML_VIEW") and context_course.cert_html_view_enabled:
certificates_url = reverse('certificates_list_handler', kwargs={'course_key_string': unicode(course_key)})
checklists_url = reverse('checklists_handler', kwargs={'course_key_string': unicode(course_key)})
certificates_url = reverse('certificates_list_handler', kwargs={'course_key_string': six.text_type(course_key)})
checklists_url = reverse('checklists_handler', kwargs={'course_key_string': six.text_type(course_key)})
%>
<h2 class="info-course">
@@ -95,7 +96,7 @@
<a href="${course_team_url}">${_("Course Team")}</a>
</li>
<li class="nav-item nav-course-settings-group-configurations">
<a href="${reverse('group_configurations_list_handler', kwargs={'course_key_string': unicode(course_key)})}">${_("Group Configurations")}</a>
<a href="${reverse('group_configurations_list_handler', kwargs={'course_key_string': six.text_type(course_key)})}">${_("Group Configurations")}</a>
</li>
<li class="nav-item nav-course-settings-advanced">
<a href="${advanced_settings_url}">${_("Advanced Settings")}</a>
@@ -123,7 +124,7 @@
</li>
% if settings.FEATURES.get('ENABLE_EXPORT_GIT') and context_course.giturl:
<li class="nav-item nav-course-tools-export-git">
<a href="${reverse('export_git', kwargs=dict(course_key_string=unicode(course_key)))}">${_("Export to Git")}</a>
<a href="${reverse('export_git', kwargs=dict(course_key_string=six.text_type(course_key)))}">${_("Export to Git")}</a>
</li>
% endif
<li class="nav-item nav-course-tools-checklists">
@@ -138,10 +139,10 @@
% elif context_library:
<%
library_key = context_library.location.course_key
index_url = reverse('library_handler', kwargs={'library_key_string': unicode(library_key)})
import_url = reverse('import_handler', kwargs={'course_key_string': unicode(library_key)})
lib_users_url = reverse('manage_library_users', kwargs={'library_key_string': unicode(library_key)})
export_url = reverse('export_handler', kwargs={'course_key_string': unicode(library_key)})
index_url = reverse('library_handler', kwargs={'library_key_string': six.text_type(library_key)})
import_url = reverse('import_handler', kwargs={'course_key_string': six.text_type(library_key)})
lib_users_url = reverse('manage_library_users', kwargs={'library_key_string': six.text_type(library_key)})
export_url = reverse('export_handler', kwargs={'course_key_string': six.text_type(library_key)})
%>
<h2 class="info-course">
<span class="sr">${_("Current Library:")}</span>