Merge pull request openedx#3582 from edx/adam/some-cleaning

adampalay · adampalay · commit 0b8cc25be319 · 2014-05-05T15:14:59.000-04:00
Adam/some cleaning
diff --git a/cms/djangoapps/contentstore/views/import_export.py b/cms/djangoapps/contentstore/views/import_export.py
@@ -238,6 +238,9 @@ def get_dir_for_fname(directory, filename):
 
                 # Send errors to client with stage at which error occurred.
                 except Exception as exception:   # pylint: disable=W0703
+                    log.exception(
+                        "error importing course"
+                    )
                     return JsonResponse(
                         {
                             'ErrMsg': str(exception),
diff --git a/common/djangoapps/student/auth.py b/common/djangoapps/student/auth.py
@@ -72,7 +72,7 @@ def _check_caller_authority(caller, role):
     :param caller: a user
     :param role: an AccessRole
     """
-    if not (caller.is_authenticated and caller.is_active):
+    if not (caller.is_authenticated() and caller.is_active):
         raise PermissionDenied
     # superuser
     if GlobalStaff().has_user(caller):
diff --git a/common/djangoapps/student/tests/test_authz.py b/common/djangoapps/student/tests/test_authz.py
@@ -76,8 +76,10 @@ def test_add_user_not_authenticated(self):
         """
         Tests that adding to creator group fails if user is not authenticated
         """
-        with mock.patch.dict('django.conf.settings.FEATURES',
-                             {'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}):
+        with mock.patch.dict(
+            'django.conf.settings.FEATURES',
+            {'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}
+        ):
             anonymous_user = AnonymousUser()
             role = CourseCreatorRole()
             add_users(self.admin, role, anonymous_user)
@@ -87,8 +89,10 @@ def test_add_user_not_active(self):
         """
         Tests that adding to creator group fails if user is not active
         """
-        with mock.patch.dict('django.conf.settings.FEATURES',
-                             {'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}):
+        with mock.patch.dict(
+            'django.conf.settings.FEATURES',
+            {'DISABLE_COURSE_CREATION': False, "ENABLE_CREATOR_GROUP": True}
+        ):
             self.user.is_active = False
             add_users(self.admin, CourseCreatorRole(), self.user)
             self.assertFalse(has_access(self.user, CourseCreatorRole()))
@@ -108,7 +112,7 @@ def test_add_user_to_group_requires_active(self):
 
     def test_add_user_to_group_requires_authenticated(self):
         with self.assertRaises(PermissionDenied):
-            self.admin.is_authenticated = False
+            self.admin.is_authenticated = mock.Mock(return_value=False)
             add_users(self.admin, CourseCreatorRole(), self.user)
 
     def test_remove_user_from_group_requires_staff_access(self):
@@ -123,7 +127,7 @@ def test_remove_user_from_group_requires_active(self):
 
     def test_remove_user_from_group_requires_authenticated(self):
         with self.assertRaises(PermissionDenied):
-            self.admin.is_authenticated = False
+            self.admin.is_authenticated = mock.Mock(return_value=False)
             remove_users(self.admin, CourseCreatorRole(), self.user)
 
 

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,9 @@ def get_dir_for_fname(directory, filename):`
`238`	`238`
`239`	`239`	`# Send errors to client with stage at which error occurred.`
`240`	`240`	`except Exception as exception: # pylint: disable=W0703`
	`241`	`+ log.exception(`
	`242`	`+ "error importing course"`
	`243`	`+ )`
`241`	`244`	`return JsonResponse(`
`242`	`245`	`{`
`243`	`246`	`'ErrMsg': str(exception),`