diff options
| author | Cody Logan <cody@lokken.dev> | 2023-11-15 10:02:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 10:02:48 -0800 |
| commit | 55a5311ee4da639a65bd60622315f3fff6936c9a (patch) | |
| tree | 285f960d4a7afe9d27ecca51e86e7f00fb914d22 /src | |
| parent | 96316c8be7bc21617ec5333f87864a0f002ebaa4 (diff) | |
| parent | ba782d54aa70a1faf6bf6cdcaeb446f7b4c503db (diff) | |
| download | wikiget-55a5311ee4da639a65bd60622315f3fff6936c9a.tar.gz wikiget-55a5311ee4da639a65bd60622315f3fff6936c9a.zip | |
Merge pull request #13 from clpo13/testing-tmp-folder
Change to temp directory when running tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/wikiget/dl.py | 4 | ||||
| -rw-r--r-- | src/wikiget/file.py | 2 | ||||
| -rw-r--r-- | src/wikiget/logging.py | 7 | ||||
| -rw-r--r-- | src/wikiget/parse.py | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/wikiget/dl.py b/src/wikiget/dl.py index abd0533..9b2777f 100644 --- a/src/wikiget/dl.py +++ b/src/wikiget/dl.py @@ -49,7 +49,7 @@ def prep_download(dl: str, args: Namespace) -> File: :type args: argparse.Namespace :raises FileExistsError: the destination file already exists on disk :return: a File object representing the file to download - :rtype: File + :rtype: wikiget.file.File """ file = get_dest(dl, args) @@ -169,7 +169,7 @@ def download(f: File, args: Namespace) -> int: """Fetch file information and contents if the file exists and save it to disk. :param f: a File object representing the file to be downloaded - :type f: File + :type f: wikiget.file.File :param args: command-line arguments and their values :type args: argparse.Namespace :return: number of errors encountered during processing diff --git a/src/wikiget/file.py b/src/wikiget/file.py index f2320b2..cbd738a 100644 --- a/src/wikiget/file.py +++ b/src/wikiget/file.py @@ -54,7 +54,7 @@ class File: """Compare this File object with another for equality. :param other: another File to compare - :type other: File + :type other: wikiget.file.File :return: True if the Files are equal and False otherwise :rtype: bool """ diff --git a/src/wikiget/logging.py b/src/wikiget/logging.py index 6673877..6614a15 100644 --- a/src/wikiget/logging.py +++ b/src/wikiget/logging.py @@ -15,13 +15,18 @@ # You should have received a copy of the GNU General Public License # along with Wikiget. If not, see <https://www.gnu.org/licenses/>. +from __future__ import annotations + import logging +from typing import Any, MutableMapping import wikiget class FileLogAdapter(logging.LoggerAdapter): - def process(self, msg, kwargs): + def process( + self, msg: Any, kwargs: MutableMapping[str, Any] + ) -> tuple[str, MutableMapping[str, Any]]: return f"[{self.extra['filename']}] {msg}", kwargs diff --git a/src/wikiget/parse.py b/src/wikiget/parse.py index 92726f0..1deaacf 100644 --- a/src/wikiget/parse.py +++ b/src/wikiget/parse.py @@ -42,7 +42,7 @@ def get_dest(dl: str, args: Namespace) -> File: :type args: argparse.Namespace :raises ParseError: the target was unable to be parsed as a valid file :return: a File object representing the target, destination, and site - :rtype: File + :rtype: wikiget.file.File """ url = urlparse(dl) |
