From 4b2f68da846023a68f842060e444834a9f496451 Mon Sep 17 00:00:00 2001 From: Ayub khan Date: Thu, 11 Jul 2019 14:51:48 +0500 Subject: [PATCH] INCR-405 python3 compatibility --- .../student/management/commands/add_to_group.py | 4 ++-- .../student/management/commands/assigngroups.py | 15 +++++++-------- .../commands/bulk_change_enrollment_csv.py | 2 ++ .../management/commands/change_enrollment.py | 2 ++ .../student/management/commands/create_user.py | 6 ++---- .../student/management/commands/manage_group.py | 2 ++ .../populate_created_on_site_user_attribute.py | 10 ++++++++-- ...est_populate_created_on_site_user_attribute.py | 2 +- .../migrations/0021_historicalcourseenrollment.py | 9 +++++---- 9 files changed, 31 insertions(+), 21 deletions(-) diff --git a/common/djangoapps/student/management/commands/add_to_group.py b/common/djangoapps/student/management/commands/add_to_group.py index 28e5b3582b..00a8eaa887 100644 --- a/common/djangoapps/student/management/commands/add_to_group.py +++ b/common/djangoapps/student/management/commands/add_to_group.py @@ -1,7 +1,7 @@ -from __future__ import print_function +from __future__ import absolute_import, print_function +from django.contrib.auth.models import Group, User from django.core.management.base import BaseCommand, CommandError -from django.contrib.auth.models import User, Group class Command(BaseCommand): diff --git a/common/djangoapps/student/management/commands/assigngroups.py b/common/djangoapps/student/management/commands/assigngroups.py index ed5bf08ef5..e6b3d279bc 100644 --- a/common/djangoapps/student/management/commands/assigngroups.py +++ b/common/djangoapps/student/management/commands/assigngroups.py @@ -1,18 +1,17 @@ -from __future__ import print_function - -from django.core.management.base import BaseCommand -from django.contrib.auth.models import User - -from student.models import UserTestGroup +from __future__ import absolute_import, print_function +import datetime +import json import random import sys -import datetime from textwrap import dedent -import json +from django.contrib.auth.models import User +from django.core.management.base import BaseCommand from pytz import UTC +from student.models import UserTestGroup + # Examples: # python manage.py assigngroups summary_test:0.3,skip_summary_test:0.7 log.txt "Do previews of future materials help?" # python manage.py assigngroups skip_capacitor:0.3,capacitor:0.7 log.txt "Do we show capacitor in linearity tutorial?" diff --git a/common/djangoapps/student/management/commands/bulk_change_enrollment_csv.py b/common/djangoapps/student/management/commands/bulk_change_enrollment_csv.py index f3ee234020..bd0e4a4270 100644 --- a/common/djangoapps/student/management/commands/bulk_change_enrollment_csv.py +++ b/common/djangoapps/student/management/commands/bulk_change_enrollment_csv.py @@ -2,6 +2,8 @@ Management command to change many user enrollments in many courses using csv file. """ +from __future__ import absolute_import + import csv import logging from os import path diff --git a/common/djangoapps/student/management/commands/change_enrollment.py b/common/djangoapps/student/management/commands/change_enrollment.py index 0918e69dd9..6cd5dd4f80 100644 --- a/common/djangoapps/student/management/commands/change_enrollment.py +++ b/common/djangoapps/student/management/commands/change_enrollment.py @@ -1,5 +1,7 @@ """ Command line script to change user enrollments. """ +from __future__ import absolute_import + import logging from django.core.management.base import BaseCommand, CommandError diff --git a/common/djangoapps/student/management/commands/create_user.py b/common/djangoapps/student/management/commands/create_user.py index 4d43c49735..8f1c985cd5 100644 --- a/common/djangoapps/student/management/commands/create_user.py +++ b/common/djangoapps/student/management/commands/create_user.py @@ -1,16 +1,14 @@ -from __future__ import print_function +from __future__ import absolute_import, print_function from django.conf import settings from django.contrib.auth.models import User from django.utils import translation - from opaque_keys.edx.keys import CourseKey from six import text_type from student.forms import AccountCreationForm -from student.helpers import do_create_account +from student.helpers import AccountValidationError, do_create_account from student.models import CourseEnrollment, create_comments_service_user -from student.helpers import AccountValidationError from track.management.tracked_command import TrackedCommand diff --git a/common/djangoapps/student/management/commands/manage_group.py b/common/djangoapps/student/management/commands/manage_group.py index cbcbf161a8..59a70d7be8 100644 --- a/common/djangoapps/student/management/commands/manage_group.py +++ b/common/djangoapps/student/management/commands/manage_group.py @@ -3,6 +3,8 @@ Management command `manage_group` is used to idempotently create Django groups and set their permissions by name. """ +from __future__ import absolute_import + from django.apps import apps from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType diff --git a/common/djangoapps/student/management/commands/populate_created_on_site_user_attribute.py b/common/djangoapps/student/management/commands/populate_created_on_site_user_attribute.py index 78819726ae..1a5345ec3a 100644 --- a/common/djangoapps/student/management/commands/populate_created_on_site_user_attribute.py +++ b/common/djangoapps/student/management/commands/populate_created_on_site_user_attribute.py @@ -1,11 +1,16 @@ """ Command to back-populate domain of the site the user account was created on. """ +from __future__ import absolute_import + from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.core.management.base import BaseCommand, CommandError -from student.models import UserAttribute, Registration +from student.models import Registration, UserAttribute +import six + + CREATED_ON_SITE = 'created_on_site' @@ -51,7 +56,8 @@ class Command(BaseCommand): except Site.DoesNotExist: question = "The site you specified is not configured as a Site in the system. " \ "Are you sure you want to continue? (y/n):" - if str(raw_input(question)).lower().strip()[0] != 'y': + + if str(six.moves.input(question)).lower().strip()[0] != 'y': return for user_id in user_ids: diff --git a/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py b/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py index e19bf6c697..9dc93840c5 100644 --- a/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py +++ b/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py @@ -137,7 +137,7 @@ class TestPopulateUserAttribute(SiteMixin, TestCase): Test management command with invalid site domain. """ fake_site_domain = 'fake-site-domain' - with mock.patch('__builtin__.raw_input', return_value=populate): + with mock.patch('six.moves.input', return_value=populate): call_command( "populate_created_on_site_user_attribute", "--users", self.user_ids, diff --git a/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py b/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py index 5d08cc5908..0e9617fc0f 100644 --- a/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py +++ b/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-25 20:18 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals + +import uuid -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion import simple_history.models -import uuid +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration):