mirror of
https://github.com/spotipy-dev/spotipy.git
synced 2026-06-19 01:03:53 +00:00
workaround for garbage collection
This commit is contained in:
parent
103d6873fa
commit
6bf645cba3
@ -26,6 +26,7 @@ Add your changes below.
|
||||
- Fixed scripts in examples directory that didn't run correctly
|
||||
- Updated documentation for `Client.current_user_top_artists` to indicate maximum number of artists limit
|
||||
- Set auth cache file permissions to `600`: https://github.com/spotipy-dev/spotipy/security/advisories/GHSA-pwhh-q4h6-w599
|
||||
- Fixed `__del__` methods by preventing garbage collection for `requests.Session`
|
||||
|
||||
### Changed
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ from collections import defaultdict
|
||||
import requests
|
||||
|
||||
from spotipy.exceptions import SpotifyException
|
||||
from spotipy.util import Retry
|
||||
from spotipy.util import REQUESTS_SESSION, Retry
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@ -211,11 +211,8 @@ class Spotify:
|
||||
|
||||
def __del__(self):
|
||||
"""Make sure the connection (pool) gets closed"""
|
||||
try:
|
||||
if isinstance(self._session, requests.Session):
|
||||
if getattr(self, "_session", None) and isinstance(self._session, REQUESTS_SESSION):
|
||||
self._session.close()
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
def _build_session(self):
|
||||
self._session = requests.Session()
|
||||
|
||||
@ -21,7 +21,7 @@ import requests
|
||||
|
||||
from spotipy.cache_handler import CacheFileHandler, CacheHandler
|
||||
from spotipy.exceptions import SpotifyOauthError, SpotifyStateError
|
||||
from spotipy.util import CLIENT_CREDS_ENV_VARS, get_host_port, normalize_scope
|
||||
from spotipy.util import CLIENT_CREDS_ENV_VARS, REQUESTS_SESSION, get_host_port, normalize_scope
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@ -122,7 +122,7 @@ class SpotifyAuthBase:
|
||||
|
||||
def __del__(self):
|
||||
"""Make sure the connection (pool) gets closed"""
|
||||
if isinstance(self._session, requests.Session):
|
||||
if getattr(self, "_session", None) and isinstance(self._session, REQUESTS_SESSION):
|
||||
self._session.close()
|
||||
|
||||
|
||||
|
||||
@ -22,6 +22,9 @@ CLIENT_CREDS_ENV_VARS = {
|
||||
"redirect_uri": "SPOTIPY_REDIRECT_URI",
|
||||
}
|
||||
|
||||
# workaround for garbage collection
|
||||
REQUESTS_SESSION = requests.Session
|
||||
|
||||
|
||||
def prompt_for_user_token(
|
||||
username=None,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user