From f6871103d61a1aed2e537bb6ec00b47948f0610d Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Tue, 26 Sep 2023 10:48:13 -0700 Subject: Additional cleanup with Ruff --- test/test_validations.py | 1 - wikiget/dl.py | 2 +- wikiget/wikiget.py | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/test_validations.py b/test/test_validations.py index 4445389..1abd96a 100644 --- a/test/test_validations.py +++ b/test/test_validations.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # wikiget - CLI tool for downloading files from Wikimedia sites # Copyright (C) 2018-2021 Cody Logan # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/wikiget/dl.py b/wikiget/dl.py index 06115a3..aa79ae3 100644 --- a/wikiget/dl.py +++ b/wikiget/dl.py @@ -130,7 +130,7 @@ def download(dl, args): else: try: fd = open(dest, "wb") - except IOError as e: + except OSError as e: print("File could not be written. The following error was encountered:") print(e) sys.exit(1) diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py index 43e4d22..33d619b 100644 --- a/wikiget/wikiget.py +++ b/wikiget/wikiget.py @@ -19,7 +19,7 @@ import argparse import logging import sys -from wikiget import DEFAULT_SITE, DEFAULT_PATH, wikiget_version +from wikiget import DEFAULT_PATH, DEFAULT_SITE, wikiget_version from wikiget.dl import download @@ -74,13 +74,13 @@ def main(): "-s", "--site", default=DEFAULT_SITE, - help="MediaWiki site to download from " "(default: %(default)s)", + help="MediaWiki site to download from (default: %(default)s)", ) parser.add_argument( "-p", "--path", default=DEFAULT_PATH, - help="MediaWiki site path, where api.php is located " "(default: %(default)s)", + help="MediaWiki site path, where api.php is located (default: %(default)s)", ) parser.add_argument( "--username", default="", help="MediaWiki site username, for private wikis" @@ -113,9 +113,9 @@ def main(): if args.verbose >= 1: print(f"Info: using batch file '{input_file}'") try: - fd = open(input_file, "r") - except IOError as e: - print("File could not be read. " "The following error was encountered:") + fd = open(input_file) + except OSError as e: + print("File could not be read. The following error was encountered:") print(e) sys.exit(1) else: -- cgit v1.2.3