Code cleanup, more consistent quotes

3 files changed, 12 insertions, 15 deletions

diff --git a/wikiget/__init__.py b/wikiget/__init__.py
index 910528b..dccd7a5 100644
--- a/wikiget/__init__.py
+++ b/wikiget/__init__.py
@@ -17,11 +17,11 @@
 
 from mwclient import __version__ as mwclient_version
 
-from .version import __version__
+from .version import __version__ as wikiget_version
 
 # set some global constants
 BLOCKSIZE = 65536
 DEFAULT_SITE = 'commons.wikimedia.org'
 DEFAULT_PATH = '/w/'
-USER_AGENT = 'wikiget/{} (https://github.com/clpo13/wikiget) ' \
-             'mwclient/{}'.format(__version__, mwclient_version)
+USER_AGENT = ('wikiget/{} (https://github.com/clpo13/wikiget) '
+              'mwclient/{}'.format(wikiget_version, mwclient_version))
diff --git a/wikiget/dl.py b/wikiget/dl.py
index e42f6a2..6a9b0e2 100644
--- a/wikiget/dl.py
+++ b/wikiget/dl.py
@@ -77,18 +77,15 @@ def download(dl, args):
     except HTTPError as e:
         # most likely a 403 forbidden or 404 not found error for api.php
         print("Error: couldn't find the specified wiki's api.php. "
-              'Check the value of --path.')
+              "Check the value of --path.")
         if args.verbose >= 2:
             print('Full error message:')
             print(e)
         sys.exit(1)
-    except InvalidResponse as e:
-        # site exists, but we couldn't communicate with the API endpoint
-        # for some reason other than an HTTP error
-        print(e)
-        sys.exit(1)
-    except LoginError as e:
-        # missing or invalid credentials
+    except (InvalidResponse, LoginError) as e:
+        # InvalidResponse: site exists, but we couldn't communicate with the
+        # API endpoint for some reason other than an HTTP error.
+        # LoginError: missing or invalid credentials
         print(e)
         sys.exit(1)
 
@@ -115,7 +112,7 @@ def download(dl, args):
 
         if args.verbose >= 1:
             print("Info: downloading '{}' "
-                  '({} bytes) from {}'.format(filename, file_size, site.host),
+                  "({} bytes) from {}".format(filename, file_size, site.host),
                   end='')
             if args.output:
                 print(" to '{}'".format(dest))
@@ -125,7 +122,7 @@ def download(dl, args):
 
         if os.path.isfile(dest) and not args.force:
             print("File '{}' already exists, skipping download "
-                  '(use -f to ignore)'.format(dest))
+                  "(use -f to ignore)".format(dest))
         else:
             try:
                 fd = open(dest, 'wb')
diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py
index 6235d6c..03f2890 100644
--- a/wikiget/wikiget.py
+++ b/wikiget/wikiget.py
@@ -19,7 +19,7 @@ import argparse
 import logging
 import sys
 
-from . import DEFAULT_SITE, DEFAULT_PATH, __version__
+from . import DEFAULT_SITE, DEFAULT_PATH, wikiget_version
 from .dl import download
 
 
@@ -49,7 +49,7 @@ def main():
                         prefix, or the URL of its file description page
                         """)
     parser.add_argument('-V', '--version', action='version',
-                        version='%(prog)s {}'.format(__version__))
+                        version='%(prog)s {}'.format(wikiget_version))
     message_options = parser.add_mutually_exclusive_group()
     message_options.add_argument('-q', '--quiet',
                                  help='suppress warning messages',