Merge pull request #762 from OMEGARAZER/pyupgrade-lint

bdfr/__init__.py

@@ -1,4 +1,3 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 __version__ = "2.6.2"

bdfr/__main__.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 import sys

bdfr/archive_entry/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

bdfr/archive_entry/base_archive_entry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from abc import ABC, abstractmethod
 from typing import Union

bdfr/archive_entry/comment_archive_entry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 
@@ -12,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 class CommentArchiveEntry(BaseArchiveEntry):
     def __init__(self, comment: praw.models.Comment):
-        super(CommentArchiveEntry, self).__init__(comment)
+        super().__init__(comment)
 
     def compile(self) -> dict:
         self.source.refresh()

bdfr/archive_entry/submission_archive_entry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 
@@ -12,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 class SubmissionArchiveEntry(BaseArchiveEntry):
     def __init__(self, submission: praw.models.Submission):
-        super(SubmissionArchiveEntry, self).__init__(submission)
+        super().__init__(submission)
 
     def compile(self) -> dict:
         comments = self._get_comments()

bdfr/archiver.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import json
 import logging
@@ -27,7 +26,7 @@ logger = logging.getLogger(__name__)
 
 class Archiver(RedditConnector):
     def __init__(self, args: Configuration, logging_handlers: Iterable[logging.Handler] = ()):
-        super(Archiver, self).__init__(args, logging_handlers)
+        super().__init__(args, logging_handlers)
 
     def download(self):
         for generator in self.reddit_lists:
@@ -66,7 +65,7 @@ class Archiver(RedditConnector):
         return [supplied_submissions]
 
     def get_user_data(self) -> list[Iterator]:
-        results = super(Archiver, self).get_user_data()
+        results = super().get_user_data()
         if self.args.user and self.args.all_comments:
             sort = self.determine_sort_function()
             for user in self.args.user:

bdfr/cloner.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from collections.abc import Iterable
@@ -16,7 +15,7 @@ logger = logging.getLogger(__name__)
 
 class RedditCloner(RedditDownloader, Archiver):
     def __init__(self, args: Configuration, logging_handlers: Iterable[logging.Handler] = ()):
-        super(RedditCloner, self).__init__(args, logging_handlers)
+        super().__init__(args, logging_handlers)
 
     def download(self):
         for generator in self.reddit_lists:

bdfr/completion.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import subprocess
 from os import environ

bdfr/configuration.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from argparse import Namespace
@@ -14,7 +13,7 @@ logger = logging.getLogger(__name__)
 
 class Configuration(Namespace):
     def __init__(self):
-        super(Configuration, self).__init__()
+        super().__init__()
         self.authenticate = False
         self.config = None
         self.opts: Optional[str] = None

bdfr/connector.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import configparser
 import importlib.resources

bdfr/download_filter.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 import re
@@ -34,7 +33,7 @@ class DownloadFilter:
         if not self.excluded_extensions:
             return True
         combined_extensions = "|".join(self.excluded_extensions)
-        pattern = re.compile(r".*({})$".format(combined_extensions))
+        pattern = re.compile(rf".*({combined_extensions})$")
         if re.match(pattern, resource_extension):
             logger.log(9, f'Url "{resource_extension}" matched with "{pattern}"')
             return False
@@ -45,7 +44,7 @@ class DownloadFilter:
         if not self.excluded_domains:
             return True
         combined_domains = "|".join(self.excluded_domains)
-        pattern = re.compile(r"https?://.*({}).*".format(combined_domains))
+        pattern = re.compile(rf"https?://.*({combined_domains}).*")
         if re.match(pattern, url):
             logger.log(9, f'Url "{url}" matched with "{pattern}"')
             return False

bdfr/downloader.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import hashlib
 import logging.handlers
@@ -38,7 +37,7 @@ def _calc_hash(existing_file: Path):
 
 class RedditDownloader(RedditConnector):
     def __init__(self, args: Configuration, logging_handlers: Iterable[logging.Handler] = ()):
-        super(RedditDownloader, self).__init__(args, logging_handlers)
+        super().__init__(args, logging_handlers)
         if self.args.search_existing:
             self.master_hash_list = self.scan_existing_files(self.download_directory)
 

bdfr/exceptions.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 
 class BulkDownloaderException(Exception):

bdfr/file_name_formatter.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import datetime
 import logging

bdfr/oauth2.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import configparser
 import logging
@@ -83,13 +82,13 @@ class OAuth2Authenticator:
 
     @staticmethod
     def send_message(client: socket.socket, message: str = ""):
-        client.send(f"HTTP/1.1 200 OK\r\n\r\n{message}".encode("utf-8"))
+        client.send(f"HTTP/1.1 200 OK\r\n\r\n{message}".encode())
         client.close()
 
 
 class OAuth2TokenManager(praw.reddit.BaseTokenManager):
     def __init__(self, config: configparser.ConfigParser, config_location: Path):
-        super(OAuth2TokenManager, self).__init__()
+        super().__init__()
         self.config = config
         self.config_location = config_location
 

bdfr/resource.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import hashlib
 import logging

bdfr/site_authenticator.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import configparser
 

bdfr/site_downloaders/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

bdfr/site_downloaders/base_downloader.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from abc import ABC, abstractmethod

bdfr/site_downloaders/delay_for_reddit.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional

bdfr/site_downloaders/direct.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from typing import Optional
 

bdfr/site_downloaders/download_factory.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import re
 import urllib.parse

bdfr/site_downloaders/erome.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 import re

bdfr/site_downloaders/fallback_downloaders/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

bdfr/site_downloaders/fallback_downloaders/fallback_downloader.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from abc import ABC, abstractmethod
 

bdfr/site_downloaders/fallback_downloaders/ytdlp_fallback.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional
@@ -17,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 class YtdlpFallback(BaseFallbackDownloader, Youtube):
     def __init__(self, post: Submission):
-        super(YtdlpFallback, self).__init__(post)
+        super().__init__(post)
 
     def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]:
         out = Resource(

bdfr/site_downloaders/gallery.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional

bdfr/site_downloaders/gfycat.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import json
 import re

bdfr/site_downloaders/imgur.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import json
 import re

bdfr/site_downloaders/pornhub.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional

bdfr/site_downloaders/redgifs.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import json
 import re

bdfr/site_downloaders/self_post.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional

bdfr/site_downloaders/vidble.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import itertools
 import logging

bdfr/site_downloaders/vreddit.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 from typing import Optional

bdfr/site_downloaders/youtube.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import logging
 import tempfile

tests/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

tests/archive_entry/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

tests/archive_entry/test_comment_archive_entry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import praw
 import pytest

tests/archive_entry/test_submission_archive_entry.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import praw
 import pytest

tests/conftest.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import configparser
 import socket

tests/integration_tests/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

tests/integration_tests/test_archive_integration.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import re
 import shutil

tests/integration_tests/test_clone_integration.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import shutil
 from pathlib import Path

tests/integration_tests/test_download_integration.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import shutil
 from pathlib import Path
@@ -218,7 +217,7 @@ def test_cli_download_download_filters(test_args: list[str], tmp_path: Path):
     test_args = create_basic_args_for_download_runner(test_args, tmp_path)
     result = runner.invoke(cli, test_args)
     assert result.exit_code == 0
-    assert any((string in result.output for string in ("Download filter removed ", "filtered due to URL")))
+    assert any(string in result.output for string in ("Download filter removed ", "filtered due to URL"))
 
 
 @pytest.mark.online

tests/site_downloaders/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

tests/site_downloaders/fallback_downloaders/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-

tests/site_downloaders/fallback_downloaders/test_ytdlp_fallback.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/site_downloaders/test_delay_for_reddit.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import Mock
 

tests/site_downloaders/test_direct.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import Mock
 

tests/site_downloaders/test_download_factory.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import praw
 import pytest

tests/site_downloaders/test_erome.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import re
 from unittest.mock import MagicMock

tests/site_downloaders/test_gallery.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import praw
 import pytest

tests/site_downloaders/test_gfycat.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import Mock
 

tests/site_downloaders/test_imgur.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import Mock
 

tests/site_downloaders/test_pornhub.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/site_downloaders/test_redgifs.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import re
 from unittest.mock import Mock

tests/site_downloaders/test_self_post.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import praw
 import pytest

tests/site_downloaders/test_vidble.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import Mock
 

tests/site_downloaders/test_vreddit.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/site_downloaders/test_youtube.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/test_archiver.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from pathlib import Path
 from unittest.mock import MagicMock

tests/test_completion.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import sys
 from pathlib import Path

tests/test_configuration.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/test_connector.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from collections.abc import Iterator
 from datetime import datetime, timedelta

tests/test_download_filter.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock
 

tests/test_downloader.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 import logging
 import re
 from pathlib import Path

tests/test_file_name_formatter.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import platform
 import sys

tests/test_oauth2.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import configparser
 from pathlib import Path

tests/test_resource.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 from unittest.mock import MagicMock