Moved roles.py to common student

lms/djangoapps/bulk_email/tasks.py

@@ -37,7 +37,7 @@ from bulk_email.models import (
     SEND_TO_MYSELF, SEND_TO_ALL, TO_OPTIONS,
 )
 from courseware.courses import get_course, course_image_url
-from courseware.roles import CourseStaffRole, CourseInstructorRole
+from student.roles import CourseStaffRole, CourseInstructorRole
 from instructor_task.models import InstructorTask
 from instructor_task.subtasks import (
     SubtaskStatus,

lms/djangoapps/courseware/access.py

@@ -20,7 +20,7 @@ from external_auth.models import ExternalAuthMap
 from courseware.masquerade import is_masquerading_as_student
 from django.utils.timezone import UTC
 from student.models import CourseEnrollment
-from courseware.roles import (
+from student.roles import (
     GlobalStaff, CourseStaffRole, CourseInstructorRole,
     OrgStaffRole, OrgInstructorRole, CourseBetaTesterRole
 )

lms/djangoapps/courseware/tests/factories.py

@@ -14,7 +14,7 @@ from student.tests.factories import RegistrationFactory  # Imported to re-export
 from student.tests.factories import UserProfileFactory as StudentUserProfileFactory
 from courseware.models import StudentModule, XModuleUserStateSummaryField
 from courseware.models import XModuleStudentInfoField, XModuleStudentPrefsField
-from courseware.roles import (
+from student.roles import (
     CourseInstructorRole,
     CourseStaffRole,
     CourseBetaTesterRole,

lms/djangoapps/courseware/tests/test_masquerade.py

@@ -16,7 +16,7 @@ from django.contrib.auth.models import User
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from courseware.roles import CourseStaffRole
+from student.roles import CourseStaffRole
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.django import modulestore, clear_existing_modulestores
 from lms.lib.xblock.runtime import quote_slashes

lms/djangoapps/courseware/tests/test_roles.py

@@ -1,5 +1,5 @@
 """
-Tests of courseware.roles
+Tests of student.roles
 """
 
 from django.test import TestCase
@@ -8,12 +8,12 @@ from xmodule.modulestore import Location
 from courseware.tests.factories import UserFactory, StaffFactory, InstructorFactory
 from student.tests.factories import AnonymousUserFactory
 
-from courseware.roles import GlobalStaff, CourseRole
+from student.roles import GlobalStaff, CourseRole
 
 
 class RolesTestCase(TestCase):
     """
-    Tests of courseware.roles
+    Tests of student.roles
     """
 
     def setUp(self):

lms/djangoapps/dashboard/sysadmin.py

@@ -29,9 +29,9 @@ from edxmako.shortcuts import render_to_response
 import mongoengine
 
 from courseware.courses import get_course_by_id
-from courseware.roles import CourseStaffRole, CourseInstructorRole
 import dashboard.git_import as git_import
 from dashboard.git_import import GitImportError
+from student.roles import CourseStaffRole, CourseInstructorRole
 from dashboard.models import CourseImportLog
 from external_auth.models import ExternalAuthMap
 from external_auth.views import generate_password

lms/djangoapps/dashboard/tests/test_sysadmin.py

@@ -17,7 +17,7 @@ from django.utils.html import escape
 from django.utils.translation import ugettext as _
 import mongoengine
 
-from courseware.roles import CourseStaffRole, GlobalStaff
+from student.roles import CourseStaffRole, GlobalStaff
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
 from dashboard.models import CourseImportLog
 from dashboard.sysadmin import Users

lms/djangoapps/instructor/access.py

@@ -12,7 +12,7 @@ TO DO sync instructor and staff flags
 import logging
 from django_comment_common.models import Role
 
-from courseware.roles import CourseBetaTesterRole, CourseInstructorRole, CourseStaffRole
+from student.roles import CourseBetaTesterRole, CourseInstructorRole, CourseStaffRole
 
 log = logging.getLogger(__name__)
 

lms/djangoapps/instructor/tests/test_access.py

@@ -9,7 +9,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 
 from django.test.utils import override_settings
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from courseware.roles import CourseBetaTesterRole, CourseStaffRole
+from student.roles import CourseBetaTesterRole, CourseStaffRole
 
 from django_comment_common.models import (Role,
                                           FORUM_ROLE_MODERATOR)

lms/djangoapps/instructor/tests/test_legacy_anon_csv.py

@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from courseware.roles import CourseStaffRole
+from student.roles import CourseStaffRole
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.django import modulestore, clear_existing_modulestores
 

lms/djangoapps/instructor/tests/test_legacy_download_csv.py

@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from courseware.roles import CourseStaffRole
+from student.roles import CourseStaffRole
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.django import modulestore, clear_existing_modulestores
 

lms/djangoapps/instructor/tests/test_legacy_forum_admin.py

@@ -15,7 +15,7 @@ from django_comment_client.utils import has_forum_access
 
 from courseware.tests.helpers import LoginEnrollmentTestCase
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
-from courseware.roles import CourseStaffRole
+from student.roles import CourseStaffRole
 from xmodule.modulestore.django import modulestore, clear_existing_modulestores
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 

lms/djangoapps/instructor/views/legacy.py

@@ -34,7 +34,7 @@ from bulk_email.models import CourseEmail, CourseAuthorization
 from courseware import grades
 from courseware.access import has_access
 from courseware.courses import get_course_with_access, get_cms_course_link
-from courseware.roles import (
+from student.roles import (
     CourseStaffRole, CourseInstructorRole, CourseBetaTesterRole, GlobalStaff
 )
 from courseware.models import StudentModule
@@ -1029,7 +1029,7 @@ def _role_members_table(role, title, course_id):
     Return a data table of usernames and names of users in group_name.
 
     Arguments:
-        role -- a courseware.roles.AccessRole
+        role -- a student.roles.AccessRole
         title -- a descriptive title to show the user
 
     Returns:
@@ -1107,7 +1107,7 @@ def remove_user_from_role(request, username_or_email, role, group_title, event_n
     Arguments:
        request: django request--used for tracking log
        username_or_email: who to remove.  Decide if it's an email by presense of an '@'
-       role: A courseware.roles.AccessRole
+       role: A student.roles.AccessRole
        group_title: what to call this group in messages to user--e.g. "beta-testers".
        event_name: what to call this event when logging to tracking logs.
 

lms/djangoapps/open_ended_grading/tests.py

@@ -26,7 +26,7 @@ from courseware.tests import factories
 from courseware.tests.helpers import LoginEnrollmentTestCase, check_for_get_code, check_for_post_code
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 from lms.lib.xblock.runtime import LmsModuleSystem
-from courseware.roles import CourseStaffRole
+from student.roles import CourseStaffRole
 from edxmako.shortcuts import render_to_string
 from student.models import unique_id_for_user