[http,pushsafer] Remove dependency on future package

Author: amotl

mqttwarn/services/http_urllib.py

@@ -5,10 +5,15 @@
 __copyright__ = 'Copyright 2014 Ben Jones'
 __license__   = 'Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)'
 
-from future import standard_library
-standard_library.install_aliases()
+try:
+    from urllib.parse import urlparse, urlencode, urljoin
+    from urllib.request import urlopen, Request
+    from urllib.error import HTTPError
+except ImportError:
+    from urlparse import urlparse  # type: ignore[no-redef]
+    from urllib import urlencode, urljoin  # type: ignore[no-redef,attr-defined]
+    from urllib2 import urlopen, Request, HTTPError  # type: ignore[no-redef]
 
-import urllib.request, urllib.parse, urllib.error
 import base64
 
 try:
@@ -71,18 +76,18 @@ def plugin(srv, item):
                 resource = url
                 if not resource.endswith('?'):
                     resource = resource + '?'
-                resource = resource + urllib.parse.urlencode(params)
+                resource = resource + urlencode(params)
             else:
                 resource = url
 
-            request = urllib.request.Request(resource)
+            request = Request(resource)
 
             if srv.SCRIPTNAME is not None:
                 request.add_header('User-agent', srv.SCRIPTNAME)
             if basicauth_token is not None:
                 request.add_header("Authorization", "Basic %s" % basicauth_token)
 
-            resp = urllib.request.urlopen(request, timeout=timeout)
+            resp = urlopen(request, timeout=timeout)
             data = resp.read()
             #srv.logging.debug("HTTP response:\n%s" % data)
         except Exception as e:
@@ -93,13 +98,13 @@ def plugin(srv, item):
 
     if method.upper() == 'POST':
         try:
-            request = urllib.request.Request(url)
+            request = Request(url)
             if params is not None:
                 if tojson is not None:
                     encoded_params = json.dumps(params)
                     request.add_header('Content-Type', 'application/json')
                 else:
-                    encoded_params = urllib.parse.urlencode(params)
+                    encoded_params = urlencode(params)
             else:
                 if tojson is not None:
                     encoded_params = item.payload
@@ -116,7 +121,7 @@ def plugin(srv, item):
                 request.add_header("Authorization", "Basic %s" % basicauth_token)
 
             srv.logging.debug("before send")
-            resp = urllib.request.urlopen(request, timeout=timeout)
+            resp = urlopen(request, timeout=timeout)
             data = resp.read()
             #srv.logging.debug("HTTP response:\n%s" % data)
         except Exception as e:

mqttwarn/services/pushsafer.py

@@ -8,13 +8,17 @@
 import dataclasses
 from collections import OrderedDict
 
-from future import standard_library
-standard_library.install_aliases()
 import os
 import json
-import urllib.request, urllib.parse, urllib.error
-import urllib.request, urllib.error, urllib.parse
-import urllib.parse
+
+try:
+    from urllib.parse import urlparse, urlencode, urljoin
+    from urllib.request import urlopen, Request
+    from urllib.error import HTTPError
+except ImportError:
+    from urlparse import urlparse  # type: ignore[no-redef]
+    from urllib import urlencode, urljoin  # type: ignore[no-redef,attr-defined]
+    from urllib2 import urlopen, Request, HTTPError  # type: ignore[no-redef]
 
 import typing as t
 
@@ -39,10 +43,10 @@ def pushsafer(**kwargs):
     # Don't submit empty parameters to Pushsafer.
     filter_empty_parameters(kwargs)
 
-    url = urllib.parse.urljoin(PUSHSAFER_API, "api")
-    data = urllib.parse.urlencode(kwargs).encode('utf-8')
-    req = urllib.request.Request(url, data)
-    response = urllib.request.urlopen(req, timeout=3)
+    url = urljoin(PUSHSAFER_API, "api")
+    data = urlencode(kwargs).encode('utf-8')
+    req = Request(url, data)
+    response = urlopen(req, timeout=3)
     output = response.read()
     data = json.loads(output)