Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

remove 'contextlib' imports

Browse Source
This commit is contained in:
Mike Fährmann 2024-04-06 03:43:12 +02:00
parent 9a8403917a
commit 40bd145637
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/cookies.py
View File

@ -10,7 +10,6 @@
# https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/cookies.py # https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/cookies.py
import binascii import binascii
import contextlib
import ctypes import ctypes
import logging import logging
import os import os
@ -682,7 +681,8 @@ def _get_gnome_keyring_password(browser_keyring_name):
# lists all keys and presumably searches for its key in the list. # lists all keys and presumably searches for its key in the list.
# It appears that we must do the same. # It appears that we must do the same.
# https://github.com/jaraco/keyring/issues/556 # https://github.com/jaraco/keyring/issues/556
with contextlib.closing(secretstorage.dbus_init()) as con: con = secretstorage.dbus_init()
try:
col = secretstorage.get_default_collection(con) col = secretstorage.get_default_collection(con)
label = browser_keyring_name + " Safe Storage" label = browser_keyring_name + " Safe Storage"
for item in col.get_all_items(): for item in col.get_all_items():
@ -691,6 +691,8 @@ def _get_gnome_keyring_password(browser_keyring_name):
else: else:
_log_error("Failed to read from GNOME keyring") _log_error("Failed to read from GNOME keyring")
return b"" return b""
finally:
con.close()
def _get_linux_keyring_password(browser_keyring_name, keyring): def _get_linux_keyring_password(browser_keyring_name, keyring):

8
test/test_job.py
View File

@ -13,7 +13,6 @@ import unittest
from unittest.mock import patch from unittest.mock import patch
import io import io
import contextlib
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from gallery_dl import job, config, text # noqa E402 from gallery_dl import job, config, text # noqa E402
@ -32,8 +31,13 @@ class TestJob(unittest.TestCase):
jobinstance = extr_or_job jobinstance = extr_or_job
with io.StringIO() as buffer: with io.StringIO() as buffer:
with contextlib.redirect_stdout(buffer): stdout = sys.stdout
sys.stdout = buffer
try:
jobinstance.run() jobinstance.run()
finally:
sys.stdout = stdout
return buffer.getvalue() return buffer.getvalue()