From eb4e47cc45e40a32a3dddf31da9db5e996b95172 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Wed, 13 Dec 2023 23:39:21 +0100 Subject: [PATCH] remove leftover bits of Python2 support (#1012) --- apprise/plugins/NotifyBoxcar.py | 6 +----- apprise/plugins/NotifyDBus.py | 3 --- apprise/plugins/NotifyGnome.py | 3 --- apprise/plugins/NotifyMacOSX.py | 3 --- apprise/plugins/NotifyWindows.py | 3 --- test/test_api.py | 1 - test/test_apprise_cli.py | 1 - test/test_apprise_pickle.py | 1 - test/test_apprise_utils.py | 1 - test/test_asyncio.py | 1 - test/test_escapes.py | 1 - test/test_plugin_custom_json.py | 10 +--------- 12 files changed, 2 insertions(+), 32 deletions(-) diff --git a/apprise/plugins/NotifyBoxcar.py b/apprise/plugins/NotifyBoxcar.py index 9d3be6aec..ec159a7a8 100644 --- 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 index 7d357aa75..3b6715741 100644 --- 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 index f27c286cb..4a4477593 100644 --- 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 index ae08da112..99cefa5cd 100644 --- 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 index 226cf92bf..acf3d549b 100644 --- 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 index 182fe2ef6..6e150fe85 100644 --- 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 index 30af15b54..0eedc9e76 100644 --- 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 index 97f0921cd..4a53ad4ec 100644 --- 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 index 6ccfe1189..f39416bd3 100644 --- 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 index 6563ceb9d..29085f575 100644 --- 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 index f4127d801..b2f241fc9 100644 --- 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 index 482ed3aac..7e2f0e4e5 100644 --- 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,