Migrate new code from merge to use OK standards

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -115,7 +115,7 @@ class ImportTestCase(CourseTestCase):
         """
         # Create a non_staff user and add it to course staff only
         __, nonstaff_user = self.create_non_staff_authed_user_client(authenticate=False)
-        auth.add_users(self.user, CourseStaffRole(self.course.location), nonstaff_user)
+        auth.add_users(self.user, CourseStaffRole(self.course.id), nonstaff_user)
 
         course = self.store.get_item(self.course_location)
         self.assertIsNotNone(course)
@@ -135,8 +135,8 @@ class ImportTestCase(CourseTestCase):
         self.assertNotEqual(display_name_before_import, display_name_after_import)
 
         # Now check that non_staff user has his same role
-        self.assertFalse(CourseInstructorRole(self.course_location).has_user(nonstaff_user))
-        self.assertTrue(CourseStaffRole(self.course_location).has_user(nonstaff_user))
+        self.assertFalse(CourseInstructorRole(self.course.id).has_user(nonstaff_user))
+        self.assertTrue(CourseStaffRole(self.course.id).has_user(nonstaff_user))
 
         # Now course staff user can also successfully import course
         self.client.login(username=nonstaff_user.username, password='foo')
@@ -146,8 +146,8 @@ class ImportTestCase(CourseTestCase):
         self.assertEquals(resp.status_code, 200)
 
         # Now check that non_staff user has his same role
-        self.assertFalse(CourseInstructorRole(self.course_location).has_user(nonstaff_user))
-        self.assertTrue(CourseStaffRole(self.course_location).has_user(nonstaff_user))
+        self.assertFalse(CourseInstructorRole(self.course.id).has_user(nonstaff_user))
+        self.assertTrue(CourseStaffRole(self.course.id).has_user(nonstaff_user))
 
     ## Unsafe tar methods #####################################################
     # Each of these methods creates a tarfile with a single type of unsafe

lms/djangoapps/class_dashboard/dashboard_data.py

@@ -193,8 +193,8 @@ def get_d3_problem_grade_distrib(course_id):
 
                                 # Compute percent of students with this grade
                                 student_count_percent = 0
-                                if total_student_count.get(child.location.url(), 0) > 0:
-                                    student_count_percent = count_grade * 100 / total_student_count[child.location.url()]
+                                if total_student_count.get(child.location, 0) > 0:
+                                    student_count_percent = count_grade * 100 / total_student_count[child.location]
 
                                 # Tooltip parameters for problem in grade distribution view
                                 tooltip = {