Remove circular import

django-cms · vinitkumar · May 21, 2025 · May 12, 2025 · May 12, 2025 · May 12, 2025
commit 339e8c2071ab77c1a9dc4638ca8c048ae0f3550c
diff --git a/cms/api.py b/cms/api.py
@@ -22,6 +22,7 @@
 
               def my_function():
                   from cms.api import api_function
+
                   api_function(...)
 
           instead of:
@@ -30,10 +31,12 @@ def my_function():
 
               from cms.api import api_function
 
+
               def my_function():
                   api_function(...)
 
 """
+
 import warnings
 
 from django.contrib.auth import get_user_model
@@ -47,8 +50,7 @@ def my_function():
 from cms.app_base import CMSApp
 from cms.apphook_pool import apphook_pool
 from cms.constants import TEMPLATE_INHERITANCE_MAGIC
-from cms.forms.validators import validate_url_uniqueness
-from cms.models import PageContent, PageUrl
+from cms.models import PageContent
 from cms.models.pagemodel import Page
 from cms.models.permissionmodels import (
     ACCESS_PAGE_AND_DESCENDANTS,
@@ -346,6 +348,8 @@ def create_page_content(
         created_by = get_clean_username(created_by)
 
     try:
+        from cms.forms.validators import validate_url_uniqueness
+
         validate_url_uniqueness(page.site, path, language, exclude_page=page.parent)
     except ValidationError as e:
         raise IntegrityError(e)

diff --git a/cms/forms/validators.py b/cms/forms/validators.py
@@ -1,13 +1,17 @@
 from typing import Optional

 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator, URLValidator
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext
 
-from cms.models.pagemodel import Page
 from cms.utils.urlutils import admin_reverse, relative_url_regex
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from cms.models.pagemodel import Page
+
 
 def validate_relative_url(value):
     RegexValidator(regex=relative_url_regex)(value)
@@ -22,7 +26,9 @@
         URLValidator()(value)
 
 
-def validate_url_uniqueness(site, path: str, language: str, user_language: Optional[str] = None, exclude_page: Optional[Page] = None):
+def validate_url_uniqueness(
+    site, path: str, language: str, user_language: Optional[str] = None, exclude_page: Optional["Page"] = None
+):
     """Checks for conflicting urls"""
     from cms.models.pagemodel import Page, PageUrl