From 7f7f6863c9ac2b785bac8da8f0935a771736e07a Mon Sep 17 00:00:00 2001
From: Chris Caron <lead2gold@gmail.com>
Date: Sat, 6 Aug 2022 12:56:19 -0400
Subject: [PATCH] Improved Hotmail/Outlook email support (#638)

---
 apprise/plugins/NotifyEmail.py |  2 +-
 test/test_plugin_email.py      | 30 +++++++++++++++++++++++++++++-
 test/test_plugin_windows.py    |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/apprise/plugins/NotifyEmail.py b/apprise/plugins/NotifyEmail.py
index 803f7801..a32c1874 100644
--- a/apprise/plugins/NotifyEmail.py
+++ b/apprise/plugins/NotifyEmail.py
@@ -111,7 +111,7 @@ EMAIL_TEMPLATES = (
         'Microsoft Hotmail',
         re.compile(
             r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(hotmail|live)\.com)$', re.I),
+            r'(?P<domain>(outlook|hotmail|live)\.com(\.au)?)$', re.I),
         {
             'port': 587,
             'smtp_host': 'smtp-mail.outlook.com',
diff --git a/test/test_plugin_email.py b/test/test_plugin_email.py
index bc314349..290a5297 100644
--- a/test/test_plugin_email.py
+++ b/test/test_plugin_email.py
@@ -382,7 +382,7 @@ def test_plugin_email(mock_smtp, mock_smtpssl):
 
         except Exception as e:
             # Handle our exception
-            if(instance is None):
+            if instance is None:
                 raise
 
             if not isinstance(e, instance):
@@ -835,3 +835,31 @@ def test_plugin_email_url_parsing(mock_smtp, mock_smtp_ssl):
     # Test that our template over-ride worked
     assert 'mode=ssl' in obj.url()
     assert 'smtp=override.com' in obj.url()
+
+    mock_smtp.reset_mock()
+    response.reset_mock()
+
+    #
+    # Test outlook/hotmail lookups
+    #
+    results = plugins.NotifyEmail.parse_url(
+        'mailtos://user:pass123@outlook.com')
+    obj = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj, plugins.NotifyEmail) is True
+    assert obj.smtp_host == 'smtp-mail.outlook.com'
+
+    results = plugins.NotifyEmail.parse_url(
+        'mailtos://user:pass123@outlook.com.au')
+    obj = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj, plugins.NotifyEmail) is True
+    assert obj.smtp_host == 'smtp-mail.outlook.com'
+
+    results = plugins.NotifyEmail.parse_url(
+        'mailtos://user:pass123@live.com')
+    obj = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj, plugins.NotifyEmail) is True
+
+    results = plugins.NotifyEmail.parse_url(
+        'mailtos://user:pass123@hotmail.com')
+    obj = Apprise.instantiate(results, suppress_exceptions=False)
+    assert isinstance(obj, plugins.NotifyEmail) is True
diff --git a/test/test_plugin_windows.py b/test/test_plugin_windows.py
index f2c60f73..2442325c 100644
--- a/test/test_plugin_windows.py
+++ b/test/test_plugin_windows.py
@@ -109,7 +109,7 @@ def test_plugin_windows_mocked():
     #
     for mod in list(sys.modules.keys()):
         if mod.startswith('apprise.'):
-            del(sys.modules[mod])
+            del sys.modules[mod]
     reload(apprise)
 
     # Create our instance