RHEL9 Support - Test cases to leverage unittest.mock when possible (#658)

dev-requirements.txt

@@ -1,6 +1,6 @@
 coverage
 flake8
-mock
+mock; python_version=='2.7'
 pytest
 pytest-cov
 tox

packaging/redhat/python-apprise.spec

@@ -60,7 +60,7 @@ Techulus Push, Telegram, Twilio, Twitter, Twist, XBMC, Vonage, Webex Teams}
 
 Name:           python-%{pypi_name}
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple wrapper to many popular notification services used today
 License:        MIT
 URL:            https://github.com/caronc/%{pypi_name}
@@ -161,7 +161,12 @@ Requires: python%{python3_pkgversion}-cryptography
 Requires: python%{python3_pkgversion}-yaml
 
 %if %{with tests}
+%if 0%{?rhel} >= 9
+# Do not import python3-mock
+%else
+# python-mock switched to unittest.mock
 BuildRequires: python%{python3_pkgversion}-mock
+%endif
 BuildRequires: python%{python3_pkgversion}-pytest
 BuildRequires: python%{python3_pkgversion}-pytest-runner
 %endif
@@ -183,6 +188,17 @@ rm -f apprise/py3compat/asyncio.py
 %patch1 -p1
 %endif
 
+%if 0%{?rhel} >= 9
+# Nothing to do under normal circumstances; this line here allows legacy
+# copies of Apprise to still build against this one
+find test -type f -name '*.py' -exec \
+   sed -i -e 's|^import mock|from unittest import mock|g' {} \;
+%else
+# support python-mock (remain backwards compatible with older distributions)
+find test -type f -name '*.py' -exec \
+   sed -i -e 's|^from unittest import mock|import mock|g' {} \;
+%endif
+
 %build
 %if 0%{?with_python2}
 %py2_build
@@ -243,6 +259,9 @@ LANG=C.UTF-8 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version
 %endif
 
 %changelog
+* Wed Aug 31 2022 Chris Caron <lead2gold@gmail.com> - 1.0.0-2
+- Rebuilt for RHEL9 Support
+
 * Sat Aug  6 2022 Chris Caron <lead2gold@gmail.com> - 1.0.0-1
 - Updated to v1.0.0
 

test/helpers/rest.py

@@ -26,7 +26,14 @@ import re
 import os
 import six
 import requests
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from json import dumps
 from random import choice
 from string import ascii_uppercase as str_alpha

test/test_api.py

@@ -29,7 +29,14 @@ import sys
 import six
 import pytest
 import requests
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from os.path import dirname
 from os.path import join
 

test/test_apprise_config.py

@@ -26,7 +26,14 @@
 import sys
 import six
 import io
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 from apprise import NotifyFormat
 from apprise import ConfigFormat

test/test_attach_base.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 from apprise.attachment.AttachBase import AttachBase
 

test/test_attach_file.py

@@ -25,7 +25,14 @@
 
 import re
 import time
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from os.path import dirname
 from os.path import join
 from apprise.attachment.AttachBase import AttachBase

test/test_attach_http.py

@@ -25,7 +25,14 @@
 
 import re
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 import mimetypes
 from os.path import join

test/test_cli.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 from __future__ import print_function
 import re
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 import json
 from inspect import cleandoc

test/test_config_file.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from apprise.config.ConfigFile import ConfigFile
 from apprise.plugins.NotifyBase import NotifyBase
 from apprise.AppriseAsset import AppriseAsset

test/test_config_http.py

@@ -26,7 +26,14 @@
 import six
 import time
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise.common import ConfigFormat
 from apprise.config.ConfigHTTP import ConfigHTTP

test/test_custom_json_plugin.py

@@ -25,7 +25,14 @@
 
 import os
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from apprise import Apprise

test/test_escapes.py

@@ -27,7 +27,14 @@ import sys
 from json import loads
 import pytest
 import requests
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import apprise
 
 

test/test_locale.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import os
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import ctypes
 
 from apprise import AppriseLocale

test/test_logger.py

@@ -26,7 +26,14 @@
 import re
 import os
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import Apprise

test/test_plugin_boxcar.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from helpers import AppriseURLTester
 from apprise import plugins
 from apprise import NotifyType

test/test_plugin_custom_form.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 import os
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from helpers import AppriseURLTester

test/test_plugin_custom_json.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 import json
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from helpers import AppriseURLTester

test/test_plugin_custom_xml.py

@@ -25,7 +25,14 @@
 import os
 import sys
 import re
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from apprise import Apprise

test/test_plugin_dapnet.py

@@ -25,7 +25,14 @@
 # Disable logging for a cleaner testing output
 import logging
 import requests
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 
 import apprise
 from apprise.plugins.NotifyDapnet import DapnetPriority

test/test_plugin_discord.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from helpers import AppriseURLTester

test/test_plugin_email.py

@@ -26,7 +26,14 @@
 import os
 import re
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import smtplib
 from email.header import decode_header
 

test/test_plugin_emby.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from json import dumps
 from apprise import Apprise
 from apprise import plugins

test/test_plugin_fcm.py

@@ -33,7 +33,14 @@ import io
 import os
 import six
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 import json

test/test_plugin_flock.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_gitter.py

@@ -25,7 +25,14 @@
 
 import six
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from helpers import AppriseURLTester
 from apprise import plugins

test/test_plugin_glib.py

@@ -26,7 +26,14 @@
 import re
 import six
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import sys
 import types
 import apprise

test/test_plugin_gnome.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import sys
 import types
 import pytest

test/test_plugin_gotify.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 import apprise

test/test_plugin_growl.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import six
 import pytest
 import apprise

test/test_plugin_guilded.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from helpers import AppriseURLTester

test/test_plugin_homeassistant.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from apprise import Apprise

test/test_plugin_ifttt.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from apprise import NotifyType

test/test_plugin_join.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 import apprise

test/test_plugin_macosx.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from helpers import module_reload
 
 import apprise

test/test_plugin_mailgun.py

@@ -25,7 +25,14 @@
 
 import os
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from helpers import AppriseURLTester
 from apprise import plugins

test/test_plugin_matrix.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 import pytest
 from apprise import plugins

test/test_plugin_messagebird.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_mqtt.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import re
 import sys
 import ssl

test/test_plugin_msg91.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_msteams.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import json
 import requests
 import pytest

test/test_plugin_nextcloud.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from helpers import AppriseURLTester

test/test_plugin_nextcloudtalk.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from helpers import AppriseURLTester

test/test_plugin_ntfy.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 import os
 import json
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 import apprise

test/test_plugin_office365.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from datetime import datetime

test/test_plugin_opsgenie.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise.plugins.NotifyOpsgenie import OpsgeniePriority
 import apprise

test/test_plugin_prowl.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise.plugins.NotifyProwl import ProwlPriority

test/test_plugin_pushbullet.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import os
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from json import dumps

test/test_plugin_pushed.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_pushover.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import os
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 import pytest
 from json import dumps

test/test_plugin_pushsafer.py

@@ -25,7 +25,14 @@
 
 import os
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from json import dumps
 from apprise import AppriseAttachment

test/test_plugin_reddit.py

@@ -25,7 +25,14 @@
 
 import six
 import requests
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 from apprise import plugins
 from helpers import AppriseURLTester
 

test/test_plugin_rocket_chat.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_sendgrid.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_ses.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import os
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import Apprise

test/test_plugin_signal.py

@@ -25,7 +25,14 @@
 import os
 import sys
 from json import loads
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_simplepush.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 import json

test/test_plugin_sinch.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from json import dumps

test/test_plugin_slack.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_smtp2go.py

@@ -25,7 +25,14 @@
 
 import os
 import sys
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from apprise import plugins
 from apprise import Apprise

test/test_plugin_sns.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from apprise import plugins

test/test_plugin_sparkpost.py

@@ -25,7 +25,14 @@
 
 import os
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from json import dumps
 from apprise import plugins

test/test_plugin_syslog.py

@@ -25,7 +25,14 @@
 
 import re
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import apprise
 import socket
 

test/test_plugin_telegram.py

@@ -27,7 +27,14 @@ import os
 import six
 import sys
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from json import dumps
 from json import loads

test/test_plugin_twilio.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 import pytest
 from json import dumps

test/test_plugin_twist.py

@@ -23,7 +23,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import requests
 from json import dumps
 from apprise import plugins

test/test_plugin_twitter.py

@@ -25,7 +25,14 @@
 
 import os
 import six
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from json import dumps

test/test_plugin_vonage.py

@@ -22,7 +22,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import pytest
 import requests
 from json import dumps

test/test_plugin_windows.py

@@ -24,7 +24,14 @@
 # THE SOFTWARE.
 
 import pytest
-import mock
+try:
+    # Python 3.x
+    from unittest import mock
+
+except ImportError:
+    # Python 2.7
+    import mock
+
 import sys
 import six
 import types