Merge pull request #3925 from alphagov/move-init-to-models

Move broadcast model code into an explicit module

app/models/broadcast_message.py

@@ -6,7 +6,10 @@ from notifications_utils.template import BroadcastPreviewTemplate
 from orderedset import OrderedSet
 from werkzeug.utils import cached_property
 
-from app.broadcast_areas import CustomBroadcastAreas, broadcast_area_libraries
+from app.broadcast_areas.models import (
+    CustomBroadcastAreas,
+    broadcast_area_libraries,
+)
 from app.formatters import round_to_significant_figures
 from app.models import JSONModel, ModelList
 from app.models.user import User

tests/app/broadcast_areas/test_broadcast_area.py

@@ -3,7 +3,7 @@ from math import isclose
 import pytest
 from custom_polygons import BRISTOL, SKYE
 
-from app.broadcast_areas import (
+from app.broadcast_areas.models import (
     BroadcastAreasRepository,
     CustomBroadcastArea,
     broadcast_area_libraries,