chore: upstream ProblemBlock exceptions and shared utilities to XBlock (#37806)

* fix: add support for xblock 5.3.0

cms/djangoapps/contentstore/management/commands/generate_courses.py

@@ -8,12 +8,12 @@ import logging
 
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.management.base import BaseCommand, CommandError
+from xblock.fields import Date
 
 from cms.djangoapps.contentstore.management.commands.utils import user_from_str
 from cms.djangoapps.contentstore.views.course import create_new_course_in_store
 from openedx.core.djangoapps.credit.models import CreditProvider
 from xmodule.course_block import CourseFields  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.fields import Date  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.exceptions import DuplicateCourseError  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.tabs import CourseTabList  # lint-amnesty, pylint: disable=wrong-import-order
 

cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py

@@ -6,6 +6,7 @@ from rest_framework import serializers
 from rest_framework.fields import Field as SerializerField
 from xblock.fields import (
     Boolean,
+    Date,
     DateTime,
     Dict,
     Field as XBlockField,
@@ -15,7 +16,6 @@ from xblock.fields import (
     String,
 )
 from xmodule.course_block import CourseFields, EmailString
-from xmodule.fields import Date
 
 from cms.djangoapps.models.settings.course_metadata import CourseMetadata
 

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -27,6 +27,7 @@ from edx_toggles.toggles.testutils import override_waffle_flag
 from milestones.models import MilestoneRelationshipType
 from milestones.tests.utils import MilestonesTestCaseMixin
 from pytz import UTC
+from xblock.fields import Date
 
 from cms.djangoapps.contentstore import toggles
 from cms.djangoapps.contentstore.utils import reverse_course_url, reverse_usage_url
@@ -49,7 +50,6 @@ from openedx.core.djangoapps.discussions.config.waffle import (
 )
 from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.lib.teams_config import TeamsConfig
-from xmodule.fields import Date  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
 

cms/djangoapps/contentstore/views/preview.py

@@ -15,12 +15,12 @@ from opaque_keys.edx.locator import LibraryContainerLocator
 from rest_framework.request import Request
 from web_fragments.fragment import Fragment
 from xblock.django.request import django_to_webob_request, webob_to_django_response
-from xblock.exceptions import NoSuchHandlerError
+from xblock.exceptions import NoSuchHandlerError, NotFoundError, ProcessingError
 from xblock.runtime import KvsFieldData
 
 from openedx.core.djangoapps.video_config.services import VideoConfigService
 from xmodule.contentstore.django import contentstore
-from xmodule.exceptions import NotFoundError, ProcessingError
+from xmodule.exceptions import NotFoundError as XModuleNotFoundError
 from xmodule.modulestore.django import XBlockI18nService, modulestore
 from xmodule.partitions.partitions_service import PartitionService
 from xmodule.services import SettingsService, TeamsConfigurationService
@@ -81,7 +81,7 @@ def preview_handler(request, usage_key_string, handler, suffix=''):
         log.exception("XBlock %s attempted to access missing handler %r", instance, handler)
         raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
 
-    except NotFoundError:
+    except (XModuleNotFoundError, NotFoundError):
         log.exception("Module indicating to user that request doesn't exist")
         raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
 

cms/djangoapps/models/settings/encoder.py

@@ -8,9 +8,9 @@ import json
 from json.encoder import JSONEncoder
 
 from opaque_keys.edx.locations import Location
+from xblock.fields import Date
 
 from openedx.core.djangoapps.models.course_details import CourseDetails
-from xmodule.fields import Date  # lint-amnesty, pylint: disable=wrong-import-order
 
 from .course_grading import CourseGradingModel