start work on py3 only v2

Author: jrabbit

hitman.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # Hitman. Or The Professional.
-# (c) 2010 - 2011, 2015 - 2017 Jack Laxson <Jrabbit>
+# (c) 2010 - 2011, 2015 - 2019 Jack Laxson <jackjrabbit+hitman@gmail.com>
 # Licensed under GPL v3 or later.
 
 import json

setup.py

@@ -1,12 +1,12 @@
 from setuptools import setup
 setup(
     name='hitman',
-    version='1.2b5',
+    version='2',
     author='Jack Laxson',
     author_email='jackjrabbit+hitman@gmail.com',
     url='https://github.com/jrabbit/hitman',
     license='GPL v3',
-    long_description="Hitman: The professional RSS enclosure (Podcast) downloader. Supports OPML. Supports various downloads methods: requests and urlgrabber (pycurl based).",
+    long_description="Hitman: The professional RSS enclosure (Podcast) downloader. Supports OPML. Uses requests.",
     description="The professional RSS enclosure (Podcast) downloader.",
     scripts=['hitman.py'],
     install_requires=['semidbm', 'requests', 'clint', 'six',
@@ -20,6 +20,5 @@
                  'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
                  'Topic :: Internet :: WWW/HTTP', 'Operating System :: BeOS',
                  'Topic :: Multimedia', 'Operating System :: OS Independent',
-                 'Programming Language :: Python :: 2.7',
                  'Programming Language :: Python :: 3.7']
 )

test_hitman.py

@@ -3,7 +3,11 @@
 import tempfile
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import pxml
 import six
 from click.testing import CliRunner