From 1901be9d17b1b27adc95982b84fe8aa43d3c123e Mon Sep 17 00:00:00 2001
From: Cody Logan <clpo13@gmail.com>
Date: Tue, 28 Jan 2020 15:06:25 -0800
Subject: Code cleanup

---
 wikiget/__init__.py | 6 ++++++
 wikiget/dl.py       | 8 ++------
 wikiget/version.py  | 2 +-
 wikiget/wikiget.py  | 3 +--
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'wikiget')

diff --git a/wikiget/__init__.py b/wikiget/__init__.py
index 253fcf8..0225ec5 100644
--- a/wikiget/__init__.py
+++ b/wikiget/__init__.py
@@ -15,6 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Wikiget. If not, see <https://www.gnu.org/licenses/>.
 
+from mwclient import __version__ as mwclient_version
+
+from .version import __version__
+
 # set some global constants
 BLOCKSIZE = 65536
 DEFAULT_SITE = 'commons.wikimedia.org'
+USER_AGENT = 'wikiget/{} (https://github.com/clpo13/wikiget) ' \
+             'mwclient/{}'.format(__version__, mwclient_version)
diff --git a/wikiget/dl.py b/wikiget/dl.py
index 4dc65c5..972058d 100644
--- a/wikiget/dl.py
+++ b/wikiget/dl.py
@@ -19,16 +19,12 @@ import os
 import sys
 from urllib.parse import unquote, urlparse
 
-from mwclient import InvalidResponse, Site, __version__ as mwclient_version
+from mwclient import InvalidResponse, Site
 from requests import ConnectionError
 from tqdm import tqdm
 
-from . import DEFAULT_SITE
+from . import DEFAULT_SITE, USER_AGENT
 from .validations import valid_file, valid_site, verify_hash
-from .version import __version__
-
-USER_AGENT = 'wikiget/{} (https://github.com/clpo13/wikiget) ' \
-             'mwclient/{}'.format(__version__, mwclient_version)
 
 
 def download(dl, args):
diff --git a/wikiget/version.py b/wikiget/version.py
index 46b9520..0460f7c 100644
--- a/wikiget/version.py
+++ b/wikiget/version.py
@@ -1 +1 @@
-__version__ = '0.4.2.dev2'
+__version__ = '0.4.2.dev3'
diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py
index ac85012..ab2ace0 100644
--- a/wikiget/wikiget.py
+++ b/wikiget/wikiget.py
@@ -19,9 +19,8 @@ import argparse
 import logging
 import sys
 
-from . import DEFAULT_SITE
+from . import DEFAULT_SITE, __version__
 from .dl import download
-from .version import __version__
 
 
 def main():
-- 
cgit v1.2.3