wip

xblock/exceptions.py

@@ -114,7 +114,7 @@ class JsonHandlerError(Exception):
     Raised by a function decorated with XBlock.json_handler to indicate that an
     error response should be returned.
     """
-    def __init__(self, status_code: int, message: str):
+    def __init__(self, status_code: int, message: str | dict):
         self.status_code = status_code
         self.message = message
 

xblock/reference/plugins.py

@@ -6,7 +6,6 @@
 
 Much of this still needs to be organized.
 """
-from django.core.exceptions import ImproperlyConfigured
 from djpyfs import djpyfs  # type: ignore[import-untyped]
 
 from xblock.fields import Field, NO_CACHE_VALUE
@@ -169,17 +168,7 @@ def load(self, instance, xblock):
         Get the filesystem for the field specified in 'instance' and the
         xblock in 'xblock' It is locally scoped.
         """
-
-        # TODO: Get xblock from context, once the plumbing is piped through
-        if djpyfs:
-            return djpyfs.get_filesystem(scope_key(instance, xblock))
-        else:
-            # The reference implementation relies on djpyfs
-            # https://github.com/openedx/django-pyfs
-            # For Django runtimes, you may use this reference
-            # implementation. Otherwise, you will need to
-            # patch pyfilesystem yourself to implement get_url.
-            raise NotImplementedError("djpyfs not available")
+        return djpyfs.get_filesystem(scope_key(instance, xblock))
 
     def __repr__(self):
         return "File system object"

xblock/utils/studio_editable.py

@@ -325,6 +325,9 @@ def render_children(
             'can_reorder': can_reorder,
         }))
 
+    def student_view(self, context: dict[str, t.Any]) -> Fragment:
+        raise NotImplementedError("StudioContainer XBlocks must implement a student_view")
+
     def author_view(self, context: dict[str, t.Any]) -> Fragment:
         """
         Display a the studio editor when the user has clicked "View" to see the container view,
@@ -406,7 +409,7 @@ def preview_view(self, context: dict[str, t.Any]) -> Fragment:
         return renderer(context)
 
 
-class StudioContainerWithNestedXBlocksMixin(StudioContainerXBlockMixin):
+class StudioContainerWithNestedXBlocksMixin(StudioContainerXBlockMixin):  # pylint: disable=abstract-method
     """
     An XBlock mixin providing interface for specifying allowed nested blocks and adding/previewing them in Studio.
     """
@@ -496,7 +499,7 @@ def _render_child_fragment(self, child: XBlock, context: dict[str, t.Any], view:
             if child.scope_ids.block_type == 'html' and getattr(self.runtime, 'is_author_mode', False):
                 # html block doesn't support preview_view, and if we use student_view Studio will wrap
                 # it in HTML that we don't want in the preview. So just render its HTML directly:
-                child_fragment = Fragment(child.data)
+                child_fragment = Fragment(child.data)  # type: ignore[attr-defined]
             else:
                 child_fragment = child.render('student_view', context)