More rename, more -python2

jellypy/http_handler.py

@@ -14,25 +14,16 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-from future.builtins import object
-from future.builtins import str
-
-from multiprocessing.dummy import Pool as ThreadPool
-from future.moves.urllib.parse import urljoin
+from multiprocessing.pool import ThreadPool
+from urllib.parse import urljoin
 
 import certifi
 import requests
 import urllib3
 
 import jellypy
-if jellypy.PYTHON2:
-    import helpers
-    import logger
-else:
-    from jellypy import helpers
-    from jellypy import logger
+from jellypy import helpers
+from jellypy import logger
 
 
 class HTTPHandler(object):