Fix out HttpUrl being overwrittn by import * from files that do n…

…ot define `__all__` (#15408)
truenas · Jan 16, 2025 · e641739 · e641739
1 parent 7dede65
commit e641739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/middlewared/middlewared/api/base/types/urls.py b/src/middlewared/middlewared/api/base/types/urls.py
@@ -4,5 +4,7 @@
 
 from middlewared.api.base.validators import https_only_check
 
+__all__ = ["HttpsOnlyURL"]
+
 
 HttpsOnlyURL = Annotated[HttpUrl, AfterValidator(https_only_check)]
diff --git a/src/middlewared/middlewared/api/base/validators.py b/src/middlewared/middlewared/api/base/validators.py
@@ -3,6 +3,8 @@
 
 from pydantic import HttpUrl
 
+__all__ = ["match_validator", "time_validator"]
+
 
 def match_validator(pattern: re.Pattern, explanation: str | None = None):
     def validator(value: str):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,5 +4,7 @@

		from middlewared.api.base.validators import https_only_check

		__all__ = ["HttpsOnlyURL"]


		HttpsOnlyURL = Annotated[HttpUrl, AfterValidator(https_only_check)]