Standardize on double quotes

5 files changed, 48 insertions, 47 deletions

diff --git a/wikiget/__init__.py b/wikiget/__init__.py
index 8437ebf..4adcae3 100644
--- a/wikiget/__init__.py
+++ b/wikiget/__init__.py
@@ -1,5 +1,5 @@
 # wikiget - CLI tool for downloading files from Wikimedia sites
-# Copyright (C) 2018, 2019, 2020 Cody Logan and contributors
+# Copyright (C) 2018-2021 Cody Logan and contributors
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Wikiget is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@ from .version import __version__ as wikiget_version
 # set some global constants
 BLOCKSIZE = 65536
 CHUNKSIZE = 1024
-DEFAULT_SITE = 'commons.wikimedia.org'
-DEFAULT_PATH = '/w/'
-USER_AGENT = ('wikiget/{} (https://github.com/clpo13/wikiget) '
-              'mwclient/{}'.format(wikiget_version, mwclient_version))
+DEFAULT_SITE = "commons.wikimedia.org"
+DEFAULT_PATH = "/w/"
+USER_AGENT = (f"wikiget/{wikiget_version} (https://github.com/clpo13/wikiget) "
+              f"mwclient/{mwclient_version}")
diff --git a/wikiget/dl.py b/wikiget/dl.py
index 856d8ca..8f32218 100644
--- a/wikiget/dl.py
+++ b/wikiget/dl.py
@@ -102,11 +102,12 @@ def download(dl, args):
     if file.imageinfo != {}:
         # file exists either locally or at a common repository,
         # like Wikimedia Commons
-        file_url = file.imageinfo['url']
-        file_size = file.imageinfo['size']
-        file_sha1 = file.imageinfo['sha1']
+        file_url = file.imageinfo["url"]
+        file_size = file.imageinfo["size"]
+        file_sha1 = file.imageinfo["sha1"]
 
-        filename_log = f"Downloading '{filename}' ({file_size} bytes) from {site.host}"
+        filename_log = (f"Downloading '{filename}' ({file_size} bytes) "
+                        f"from {site.host}")
         if args.output:
             filename_log += f" to '{dest}'"
         logging.info(filename_log)
@@ -117,7 +118,7 @@ def download(dl, args):
                             "(use -f to ignore)")
         else:
             try:
-                fd = open(dest, 'wb')
+                fd = open(dest, "wb")
             except IOError as e:
                 logging.error("File could not be written. "
                               "The following error was encountered:")
@@ -130,7 +131,7 @@ def download(dl, args):
                 else:
                     leave_bars = False
                 with tqdm(leave=leave_bars, total=file_size,
-                          unit='B', unit_scale=True,
+                          unit="B", unit_scale=True,
                           unit_divisor=CHUNKSIZE) as progress_bar:
                     with fd:
                         res = site.connection.get(file_url, stream=True)
diff --git a/wikiget/validations.py b/wikiget/validations.py
index 20ef74f..bd99570 100644
--- a/wikiget/validations.py
+++ b/wikiget/validations.py
@@ -31,7 +31,7 @@ def valid_file(search_string):
     """
     # second group could also restrict to file extensions with three or more
     # letters with ([^/\r\n\t\f\v]+\.\w{3,})
-    file_regex = re.compile(r'(File:|Image:)([^/\r\n\t\f\v]+\.\w+)$', re.I)
+    file_regex = re.compile(r"(File:|Image:)([^/\r\n\t\f\v]+\.\w+)$", re.I)
     return file_regex.search(search_string)
 
 
@@ -44,7 +44,7 @@ def valid_site(search_string):
     :param search_string: string to validate
     :returns: a regex Match object if there's a match or None otherwise
     """
-    site_regex = re.compile(r'wiki[mp]edia\.org$', re.I)
+    site_regex = re.compile(r"wiki[mp]edia\.org$", re.I)
     return site_regex.search(search_string)
 
 
@@ -56,7 +56,7 @@ def verify_hash(filename):
     :return: hash digest
     """
     hasher = hashlib.sha1()
-    with open(filename, 'rb') as dl:
+    with open(filename, "rb") as dl:
         buf = dl.read(BLOCKSIZE)
         while len(buf) > 0:
             hasher.update(buf)
diff --git a/wikiget/version.py b/wikiget/version.py
index 93b60a1..dd9b22c 100644
--- a/wikiget/version.py
+++ b/wikiget/version.py
@@ -1 +1 @@
-__version__ = '0.5.1'
+__version__ = "0.5.1"
diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py
index 6a537ba..a8679c9 100644
--- a/wikiget/wikiget.py
+++ b/wikiget/wikiget.py
@@ -44,42 +44,42 @@ def main():
                                      conditions. There is NO WARRANTY, to the
                                      extent permitted by law.
                                      """)
-    parser.add_argument('FILE', help="""
+    parser.add_argument("FILE", help="""
                         name of the file to download with the File:
                         prefix, or the URL of its file description page
                         """)
-    parser.add_argument('-V', '--version', action='version',
-                        version=f'%(prog)s {wikiget_version}')
+    parser.add_argument("-V", "--version", action="version",
+                        version=f"%(prog)s {wikiget_version}")
     message_options = parser.add_mutually_exclusive_group()
-    message_options.add_argument('-q', '--quiet',
-                                 help='suppress warning messages',
-                                 action='store_true')
-    message_options.add_argument('-v', '--verbose',
-                                 help='print detailed information; '
-                                 'use -vv for even more detail',
-                                 action='count', default=0)
-    parser.add_argument('-f', '--force',
-                        help='force overwriting existing files',
-                        action='store_true')
-    parser.add_argument('-s', '--site', default=DEFAULT_SITE,
-                        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)')
-    parser.add_argument('--username', default='',
-                        help='MediaWiki site username, for private wikis')
-    parser.add_argument('--password', default='',
-                        help='MediaWiki site password, for private wikis')
+    message_options.add_argument("-q", "--quiet",
+                                 help="suppress warning messages",
+                                 action="store_true")
+    message_options.add_argument("-v", "--verbose",
+                                 help="print detailed information; "
+                                 "use -vv for even more detail",
+                                 action="count", default=0)
+    parser.add_argument("-f", "--force",
+                        help="force overwriting existing files",
+                        action="store_true")
+    parser.add_argument("-s", "--site", default=DEFAULT_SITE,
+                        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)")
+    parser.add_argument("--username", default="",
+                        help="MediaWiki site username, for private wikis")
+    parser.add_argument("--password", default="",
+                        help="MediaWiki site password, for private wikis")
     output_options = parser.add_mutually_exclusive_group()
-    output_options.add_argument('-o', '--output',
-                                help='write download to OUTPUT')
-    output_options.add_argument('-a', '--batch',
-                                help='treat FILE as a textfile containing '
-                                'multiple files to download, one URL or '
-                                'filename per line', action='store_true')
-    parser.add_argument('-l', '--logfile', default='',
-                        help='save log output to LOGFILE')
+    output_options.add_argument("-o", "--output",
+                                help="write download to OUTPUT")
+    output_options.add_argument("-a", "--batch",
+                                help="treat FILE as a textfile containing "
+                                "multiple files to download, one URL or "
+                                "filename per line", action="store_true")
+    parser.add_argument("-l", "--logfile", default="",
+                        help="save log output to LOGFILE")
 
     args = parser.parse_args()
 
@@ -131,7 +131,7 @@ def main():
         logging.info(f"Using batch file '{input_file}'.")
 
         try:
-            fd = open(input_file, 'r')
+            fd = open(input_file, "r")
         except IOError as e:
             logging.error("File could not be read. "
                           "The following error was encountered:")