3 files changed, 3 insertions, 58 deletions
diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/__init__.py b/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/__init__.py
new file mode 100644
index 000000000..37350ce0b
--- /dev/null
+++ b/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/__init__.py
@@ -0,0 +1 @@
+"""Internal implementation of `~certbot_dns_dnsmadeeasy.dns_dnsmadeeasy` plugin."""
diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/dns_dnsmadeeasy.py b/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py
index 4b63cb4b5..ed3146dce 100644
--- a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/dns_dnsmadeeasy.py
+++ b/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/_internal/dns_dnsmadeeasy.py
@@ -1,8 +1,8 @@
 """DNS Authenticator for DNS Made Easy DNS."""
 import logging
 
-import zope.interface
 from lexicon.providers import dnsmadeeasy
+import zope.interface
 
 from certbot import errors
 from certbot import interfaces
@@ -82,7 +82,7 @@ class _DNSMadeEasyLexiconClient(dns_common_lexicon.LexiconClient):
 
     def _handle_http_error(self, e, domain_name):
         if domain_name in str(e) and str(e).startswith('404 Client Error: Not Found for url:'):
-            return
+            return None
 
         hint = None
         if str(e).startswith('403 Client Error: Forbidden for url:'):
diff --git a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/dns_dnsmadeeasy_test.py b/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/dns_dnsmadeeasy_test.py
deleted file mode 100644
index 44a777e1b..000000000
--- a/certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy/dns_dnsmadeeasy_test.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""Tests for certbot_dns_dnsmadeeasy.dns_dnsmadeeasy."""
-
-import os
-import unittest
-
-import mock
-from requests.exceptions import HTTPError
-
-from certbot.plugins import dns_test_common
-from certbot.plugins import dns_test_common_lexicon
-from certbot.plugins.dns_test_common import DOMAIN
-from certbot.tests import util as test_util
-
-API_KEY = 'foo'
-SECRET_KEY = 'bar'
-
-
-class AuthenticatorTest(test_util.TempDirTestCase,
-                        dns_test_common_lexicon.BaseLexiconAuthenticatorTest):
-
-    def setUp(self):
-        super(AuthenticatorTest, self).setUp()
-
-        from certbot_dns_dnsmadeeasy.dns_dnsmadeeasy import Authenticator
-
-        path = os.path.join(self.tempdir, 'file.ini')
-        dns_test_common.write({"dnsmadeeasy_api_key": API_KEY,
-                               "dnsmadeeasy_secret_key": SECRET_KEY},
-                              path)
-
-        self.config = mock.MagicMock(dnsmadeeasy_credentials=path,
-                                     dnsmadeeasy_propagation_seconds=0)  # don't wait during tests
-
-        self.auth = Authenticator(self.config, "dnsmadeeasy")
-
-        self.mock_client = mock.MagicMock()
-        # _get_dnsmadeeasy_client | pylint: disable=protected-access
-        self.auth._get_dnsmadeeasy_client = mock.MagicMock(return_value=self.mock_client)
-
-
-class DNSMadeEasyLexiconClientTest(unittest.TestCase,
-                                   dns_test_common_lexicon.BaseLexiconClientTest):
-    DOMAIN_NOT_FOUND = HTTPError('404 Client Error: Not Found for url: {0}.'.format(DOMAIN))
-    LOGIN_ERROR = HTTPError('403 Client Error: Forbidden for url: {0}.'.format(DOMAIN))
-
-    def setUp(self):
-        from certbot_dns_dnsmadeeasy.dns_dnsmadeeasy import _DNSMadeEasyLexiconClient
-
-        self.client = _DNSMadeEasyLexiconClient(API_KEY, SECRET_KEY, 0)
-
-        self.provider_mock = mock.MagicMock()
-        self.client.provider = self.provider_mock
-
-
-if __name__ == "__main__":
-    unittest.main()  # pragma: no cover