Merge pull request #19166 from edx/rev/content-gating-waffle

Rev/content gating waffle

common/lib/xmodule/xmodule/partitions/partitions.py

@@ -255,7 +255,7 @@ class UserPartition(namedtuple("UserPartition", "id name description groups sche
         """
         return None
 
-    def access_denied_fragment(self, block, user, course_key, user_group, allowed_groups):
+    def access_denied_fragment(self, block, user, user_group, allowed_groups):
         """
         Return an html fragment that should be displayed to the user when they are not allowed to access
         content managed by this partition, or None if there is no applicable message.

common/lib/xmodule/xmodule/partitions/partitions_service.py

@@ -8,10 +8,7 @@ from django.utils.translation import ugettext_lazy as _
 import logging
 
 from openedx.core.lib.cache_utils import request_cached
-from openedx.features.content_type_gating.partitions import (
-    CONTENT_GATING_PARTITION_ID,
-    create_content_gating_partition,
-)
+from openedx.features.content_type_gating.partitions import create_content_gating_partition
 from xmodule.partitions.partitions import (
     UserPartition,
     UserPartitionError,