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

run python modernize

Browse Source
This commit is contained in:
Stuart Young
2019-05-15 09:59:25 -04:00
parent a6fce12162
commit 8b7bb776b0
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/djangoapps/ccx/migrations/0001_initial.py
View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from __future__ import absolute_import
from django.db import migrations, models
from django.conf import settings
from opaque_keys.edx.django.models import CourseKeyField, UsageKeyField

1
lms/djangoapps/ccx/migrations/0002_customcourseforedx_structure_json.py
View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from __future__ import absolute_import
from django.db import migrations, models

6
lms/djangoapps/ccx/migrations/0003_add_master_course_staff_in_ccx.py
View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from __future__ import absolute_import
import logging
from ccx_keys.locator import CCXLocator
@@ -12,6 +13,7 @@ from lms.djangoapps.ccx.utils import (
add_master_course_staff_to_ccx,
remove_master_course_staff_from_ccx,
)
import six
log = logging.getLogger("edx.ccx")
@@ -31,7 +33,7 @@ def add_master_course_staff_to_ccx_for_existing_ccx(apps, schema_editor):
if not ccx.course_id or ccx.course_id.deprecated:
# prevent migration for deprecated course ids or invalid ids.
continue
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, unicode(ccx.id))
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, six.text_type(ccx.id))
try:
course = get_course_by_id(ccx.course_id)
add_master_course_staff_to_ccx(
@@ -63,7 +65,7 @@ def remove_master_course_staff_from_ccx_for_existing_ccx(apps, schema_editor):
if not ccx.course_id or ccx.course_id.deprecated:
# prevent migration for deprecated course ids or invalid ids.
continue
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, unicode(ccx.id))
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, six.text_type(ccx.id))
try:
course = get_course_by_id(ccx.course_id)
remove_master_course_staff_from_ccx(

4
lms/djangoapps/ccx/migrations/0004_seed_forum_roles_in_ccx_courses.py
View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from __future__ import absolute_import
import logging
from ccx_keys.locator import CCXLocator
@@ -12,6 +13,7 @@ from openedx.core.djangoapps.django_comment_common.models import FORUM_ROLE_ADMI
FORUM_ROLE_COMMUNITY_TA, FORUM_ROLE_STUDENT
from openedx.core.djangoapps.django_comment_common.utils import STUDENT_ROLE_PERMISSIONS, MODERATOR_ROLE_PERMISSIONS, \
ADMINISTRATOR_ROLE_PERMISSIONS
import six
log = logging.getLogger("edx.ccx")
@@ -44,7 +46,7 @@ def seed_forum_roles_for_existing_ccx(apps, schema_editor):
)
continue
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, unicode(ccx.id))
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, six.text_type(ccx.id))
# Create forum roles.
admin_role, _ = Role.objects.get_or_create(name=FORUM_ROLE_ADMINISTRATOR, course_id=ccx_locator)

14
lms/djangoapps/ccx/migrations/0005_change_ccx_coach_to_staff.py
View File

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from __future__ import absolute_import
import logging
from django.contrib.auth.models import User
@@ -9,6 +10,7 @@ from django.http import Http404
from ccx_keys.locator import CCXLocator
from courseware.courses import get_course_by_id
from instructor.access import allow_access, revoke_access
import six
log = logging.getLogger("edx.ccx")
@@ -31,18 +33,18 @@ def change_existing_ccx_coaches_to_staff(apps, schema_editor):
return
list_ccx = CustomCourseForEdX.objects.using(db_alias).all()
for ccx in list_ccx:
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, unicode(ccx.id))
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, six.text_type(ccx.id))
try:
course = get_course_by_id(ccx_locator)
except Http404:
log.error('Could not migrate access for CCX course: %s', unicode(ccx_locator))
log.error('Could not migrate access for CCX course: %s', six.text_type(ccx_locator))
else:
coach = User.objects.get(id=ccx.coach.id)
allow_access(course, coach, 'staff', send_email=False)
revoke_access(course, coach, 'ccx_coach', send_email=False)
log.info(
'The CCX coach of CCX %s has been switched from "CCX Coach" to "Staff".',
unicode(ccx_locator)
six.text_type(ccx_locator)
)
def revert_ccx_staff_to_coaches(apps, schema_editor):
@@ -61,18 +63,18 @@ def revert_ccx_staff_to_coaches(apps, schema_editor):
return
list_ccx = CustomCourseForEdX.objects.using(db_alias).all()
for ccx in list_ccx:
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, unicode(ccx.id))
ccx_locator = CCXLocator.from_course_locator(ccx.course_id, six.text_type(ccx.id))
try:
course = get_course_by_id(ccx_locator)
except Http404:
log.error('Could not migrate access for CCX course: %s', unicode(ccx_locator))
log.error('Could not migrate access for CCX course: %s', six.text_type(ccx_locator))
else:
coach = User.objects.get(id=ccx.coach.id)
allow_access(course, coach, 'ccx_coach', send_email=False)
revoke_access(course, coach, 'staff', send_email=False)
log.info(
'The CCX coach of CCX %s has been switched from "Staff" to "CCX Coach".',
unicode(ccx_locator)
six.text_type(ccx_locator)
)
class Migration(migrations.Migration):

1
lms/djangoapps/ccx/migrations/0006_set_display_name_as_override.py
View File

@@ -2,6 +2,7 @@
# Generated by Django 1.11.15 on 2018-08-31 18:13
from __future__ import unicode_literals
from __future__ import absolute_import
from django.db import migrations
from django.http import Http404