Merge pull request containers#607 from yangdanny97/patch-1

openshift-merge-bot[bot] · web-flow · commit 435e7a904b92 · 2025-12-10T10:51:13.000Z
Delete custom cached_property in favor of functools.cached_property
diff --git a/podman/api/__init__.py b/podman/api/__init__.py
@@ -1,6 +1,5 @@
 """Tools for connecting to a Podman service."""
 
-from podman.api.cached_property import cached_property
 from podman.api.client import APIClient
 from podman.api.api_versions import VERSION, COMPATIBLE_VERSION
 from podman.api.http_utils import encode_auth_header, prepare_body, prepare_filters
@@ -24,7 +23,6 @@
     'COMPATIBLE_VERSION',
     'DEFAULT_CHUNK_SIZE',
     'VERSION',
-    'cached_property',
     'create_tar',
     'decode_header',
     'encode_auth_header',
diff --git a/podman/api/cached_property.py b/podman/api/cached_property.py
diff --git a/podman/client.py b/podman/client.py
@@ -3,10 +3,10 @@
 import logging
 import os
 from contextlib import AbstractContextManager
+from functools import cached_property
 from pathlib import Path
 from typing import Any, Optional
 
-from podman.api import cached_property
 from podman.api.client import APIClient
 from podman.api.path_utils import get_runtime_dir
 from podman.domain.config import PodmanConfig
diff --git a/podman/domain/config.py b/podman/domain/config.py
@@ -2,11 +2,11 @@
 
 import sys
 import urllib
+from functools import cached_property
 from pathlib import Path
 from typing import Optional
 import json
 
-from podman.api import cached_property
 from podman.api.path_utils import get_xdg_config_home
 
 if sys.version_info >= (3, 11):
