Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions python/tank/authentication/sso_saml2/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ def __getattr__(name):
if is_import:
raise

deprecation_message = (
f"Accessing '{__name__}.{name}' directly without explicit import "
"is deprecated and compatibility will be discontinued after "
f"September 2026. Explicitly import '{__name__}.{name}' instead."
)

import warnings
warnings.warn(
f"Accessing '{__name__}.{name}' directly without explicit import "
"is deprecated and will be removed at any time after 2026-07. "
f"Explicitly import '{__name__}.{name}' instead.",
deprecation_message,
DeprecationWarning,
stacklevel=2,
)

try:
import tank
logger = tank.LogManager.get_logger(__name__)
logger.warning(
f"Accessing '{__name__}.{name}' directly without explicit import "
"is deprecated and will be removed at any time after 2026-07. "
f"Explicitly import '{__name__}.{name}' instead.",
)
logger.warning(deprecation_message)
except:
pass # nosec

Expand Down
10 changes: 5 additions & 5 deletions python/tank_vendor/sgutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import warnings
warnings.warn(
"The 'sgutils' module, including the 'ensure_binary', 'ensure_str', "
"and 'ensure_text' methods, is deprecated in FPTR and will be removed "
"at any time after March 2026. "
"and 'ensure_text' methods, is deprecated in FPT and will be removed "
"after September 2026. "
"Use the built-in str.encode() and/or bytes.decode() methods instead "
"according to the expected data type.",
DeprecationWarning,
Expand All @@ -48,7 +48,7 @@ def ensure_binary(s, encoding="utf-8", errors="strict"):
"""
warnings.warn(
"The 'sgutils.ensure_binary' method is deprecated and will be "
"removed at any time after March 2026.",
"removed after September 2026.",
DeprecationWarning,
stacklevel=2,
)
Expand All @@ -69,7 +69,7 @@ def ensure_str(s, encoding="utf-8", errors="strict"):
"""
warnings.warn(
"The 'sgutils.ensure_str' method is deprecated and will be "
"removed at any time after March 2026.",
"removed after September 2026.",
DeprecationWarning,
stacklevel=2,
)
Expand All @@ -91,7 +91,7 @@ def ensure_text(*args, **kwargs):
"""
warnings.warn(
"The 'sgutils.ensure_text' method is deprecated and will be "
"removed at any time after March 2026.",
"removed after September 2026.",
DeprecationWarning,
stacklevel=2,
)
Expand Down
4 changes: 2 additions & 2 deletions python/tank_vendor/six.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
__version__ = "1.13.0"

warnings.warn(
"The 'six' module is deprecated in FPTR and will be removed at any time "
"after March 2026. Please update your code to use standard Python 3 "
"The 'six' module is deprecated in FPT and will be removed after September "
"2026. Please update your code to use standard Python 3 "
"features directly, as Python 2 compatibility is no longer required.",
DeprecationWarning,
stacklevel=2,
Expand Down
Loading