Organizing mail processing function code

Author: bluebamus

portfolio/views.py

@@ -12,8 +12,6 @@
 from django.utils import translation
 from django.utils.decorators import method_decorator
 from django.views.generic import TemplateView, View
-from email_validator import (EmailNotValidError, caching_resolver,
-                             validate_email)
 from validate_email import validate_email
 from validate_email.exceptions import Error
 
@@ -171,9 +169,6 @@ def get(self, request, *args, **kwargs):
         return JsonResponse(context, safe=False)
 
 
-resolver = caching_resolver(timeout=10)
-
-
 class GetInTouchView(View):
     email_template_get_in_touch = "/email/get_in_touch.html"
 
@@ -202,22 +197,18 @@ def check_email_validation_with_dns(self, email: str) -> [str, bool]:
             if not is_valid:
                 raise Error("The email failed validation. Please enter the email address you actually use")
 
-            emailinfo = validate_email(
-                email, check_deliverability=True, dns_resolver=resolver
-            )
             logger.debug(
-                "GetInTouchView.emailinfo.normalized :",
-                extra={"normalized": emailinfo.normalized},
+                "GetInTouchView email validated"
             )
 
-            return emailinfo.normalized, True
+            return is_valid
 
-        except (Error, EmailNotValidError, ValueError) as e:
+        except (Error,  ValueError) as e:
             logger.debug(
                 "Error :",
                 extra={"GetInTouchView.error : ": str(e)},
             )
-            return "", False
+            return is_valid
 
     def post(self, request, *args, **kwargs):
         pattern = re.compile("^[a-zA-Z0-9+-_.]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$")
@@ -228,7 +219,7 @@ def post(self, request, *args, **kwargs):
         subject = request.POST.get("subject", "")
         message = request.POST.get("message", "")
 
-        _, rt = self.check_email_validation_with_dns(emailfrom)
+        rt = self.check_email_validation_with_dns(emailfrom)
 
         if not rt:
             logger.debug(

users/views/users_forms.py

@@ -6,8 +6,6 @@
 from django import forms
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
-from email_validator import (EmailNotValidError, caching_resolver,
-                             validate_email)
 from validate_email import validate_email
 from validate_email.exceptions import Error
 
@@ -19,9 +17,6 @@
 
 logger = logging.getLogger(getattr(settings, "USERS_LOGGER", "django"))
 
-resolver = caching_resolver(timeout=10)
-
-
 class RegisterForm(forms.Form):
     email = forms.EmailField(
         label="Email",
@@ -79,7 +74,7 @@ class RegisterForm(forms.Form):
     def check_email_validation_with_dns(self, email: str) -> [str, bool]:
         try:
             if email is None:
-                raise ValueError("Email is None type")
+                return False
             logger.debug(
                 "check_email_validation_with_dns email :", extra={"email": email}
             )
@@ -99,28 +94,25 @@ def check_email_validation_with_dns(self, email: str) -> [str, bool]:
             if not is_valid:
                 raise Error("The email failed validation. Please enter the email address you actually use")
 
-            emailinfo = validate_email(
-                email, check_deliverability=True, dns_resolver=resolver
-            )
             logger.debug(
-                "emailinfo.normalized :", extra={"normalized": emailinfo.normalized}
+                "email validated"
             )
-            return emailinfo.normalized, True
+            return is_valid
 
-        except (Error, EmailNotValidError, ValueError) as e:
+        except (Error, ValueError) as e:
             logger.debug(
                 "Error :",
                 extra={"error : ": str(e)},
             )
-            return "", False
+            return is_valid
 
     def clean(self):
         cleaned_data = super(RegisterForm, self).clean()
         email = cleaned_data.get("email")
         password = cleaned_data.get("password")
         password_confirm = cleaned_data.get("password_confirm")
 
-        _, rt = self.check_email_validation_with_dns(email)
+        rt = self.check_email_validation_with_dns(email)
         if not rt:
             logger.debug(
                 "The email failed validation. Please enter the email address you actually use",