remove leftover bits of Python2 support (#1012)

caronc · Dec 13, 2023 · eb4e47c · eb4e47c
1 parent a25ff00
commit eb4e47c
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 32 deletions.
diff --git a/apprise/plugins/NotifyBoxcar.py b/apprise/plugins/NotifyBoxcar.py
@@ -33,11 +33,7 @@
 from time import time
 from hashlib import sha1
 from itertools import chain
-try:
-    from urlparse import urlparse
-
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 from .NotifyBase import NotifyBase
 from ..URLBase import PrivacyMode

diff --git a/apprise/plugins/NotifyDBus.py b/apprise/plugins/NotifyDBus.py
@@ -26,9 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import sys
 from .NotifyBase import NotifyBase
 from ..common import NotifyImageSize

diff --git a/apprise/plugins/NotifyGnome.py b/apprise/plugins/NotifyGnome.py
@@ -26,9 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from .NotifyBase import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType

diff --git a/apprise/plugins/NotifyMacOSX.py b/apprise/plugins/NotifyMacOSX.py
@@ -26,9 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 import platform
 import subprocess
 import os

diff --git a/apprise/plugins/NotifyWindows.py b/apprise/plugins/NotifyWindows.py
@@ -26,9 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
-from __future__ import print_function
-
 from time import sleep
 
 from .NotifyBase import NotifyBase

diff --git a/test/test_api.py b/test/test_api.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import asyncio
 import concurrent.futures
 import re

diff --git a/test/test_apprise_cli.py b/test/test_apprise_cli.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import re
 from unittest import mock
 

diff --git a/test/test_apprise_pickle.py b/test/test_apprise_pickle.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import sys
 import pickle
 from apprise import Apprise, AppriseAsset, AppriseLocale

diff --git a/test/test_apprise_utils.py b/test/test_apprise_utils.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import re
 import os
 import sys

diff --git a/test/test_asyncio.py b/test/test_asyncio.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import sys
 import pytest
 from apprise import Apprise

diff --git a/test/test_escapes.py b/test/test_escapes.py
@@ -26,7 +26,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 from json import loads
 import requests
 from unittest import mock

diff --git a/test/test_plugin_custom_json.py b/test/test_plugin_custom_json.py
@@ -27,7 +27,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import os
-import sys
 import json
 from unittest import mock
 
@@ -257,13 +256,6 @@ def test_notify_json_plugin_attachments(mock_post):
         body='body', title='title', notify_type=NotifyType.INFO,
         attach=path) is False
 
-    # Get a appropriate "builtin" module name for pythons 2/3.
-    if sys.version_info.major >= 3:
-        builtin_open_function = 'builtins.open'
-
-    else:
-        builtin_open_function = '__builtin__.open'
-
     # Test Valid Attachment (load 3)
     path = (
         os.path.join(TEST_VAR_DIR, 'apprise-test.gif'),
@@ -275,7 +267,7 @@ def test_notify_json_plugin_attachments(mock_post):
     # Return our good configuration
     mock_post.side_effect = None
     mock_post.return_value = okay_response
-    with mock.patch(builtin_open_function, side_effect=OSError()):
+    with mock.patch('builtins.open', side_effect=OSError()):
         # We can't send the message we can't open the attachment for reading
         assert obj.notify(
             body='body', title='title', notify_type=NotifyType.INFO,