email-validator 2.1.0.post1__tar.gz → 2.1.2__tar.gz

email_validator-2.1.2/LICENSE

@@ -0,0 +1,27 @@
+This is free and unencumbered software released into the public
+domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a
+compiled binary, for any purpose, commercial or non-commercial,
+and by any means.
+
+In jurisdictions that recognize copyright laws, the author or
+authors of this software dedicate any and all copyright
+interest in the software to the public domain. We make this
+dedication for the benefit of the public at large and to the
+detriment of our heirs and successors. We intend this
+dedication to be an overt act of relinquishment in perpetuity
+of all present and future rights to this software under
+copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER 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.
+
+For more information, please refer to <https://unlicense.org/>

{email_validator-2.1.0.post1 → email_validator-2.1.2}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: email_validator
-Version: 2.1.0.post1
+Version: 2.1.2
 Summary: A robust email address syntax and deliverability validation library.
 Home-page: https://github.com/JoshData/python-email-validator
 Author: Joshua Tauberer
 Author-email: jt@occams.info
-License: CC0 (copyright waived)
+License: Unlicense
 Keywords: email address validator
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
+Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -37,8 +37,8 @@ necessarily for composing an email message, see below).
 
 Key features:
 
-* Checks that an email address has the correct syntax --- good for
-  registration/login forms or other uses related to identifying users.
+* Checks that an email address has the correct syntax --- great for
+  email-based registration/login forms or validing data.
 * Gives friendly English error messages when validation fails that you
   can display to end-users.
 * Checks deliverability (optional): Does the domain name resolve?
@@ -233,7 +233,7 @@ local parts, a wider range of Unicode characters are allowed.
 
 A surprisingly large number of Unicode characters are not safe to display,
 especially when the email address is concatenated with other text, so this
-library tries to protect you by not permitting resvered, non-, private use,
+library tries to protect you by not permitting reserved, non-, private use,
 formatting (which can be used to alter the display order of characters),
 whitespace, and control characters, and combining characters
 as the first character of the local part and the domain name (so that they
@@ -448,7 +448,6 @@ or likely to cause trouble:
   No one uses these forms anymore, and I can't think of any reason why anyone
   using this library would need to accept them.
 
-
 Testing
 -------
 
@@ -480,3 +479,8 @@ git tag v$(cat email_validator/version.py  | sed "s/.* = //" | sed 's/"//g')
 git push --tags
 ./release_to_pypi.sh
 ```
+
+License
+-------
+
+This project is free of any copyright restrictions per the [Unlicense](https://unlicense.org/). (Prior to Feb. 4, 2024, the project was made available under the terms of the [CC0 1.0 Universal public domain dedication](http://creativecommons.org/publicdomain/zero/1.0/).) See [LICENSE](LICENSE) and [CONTRIBUTING.md](CONTRIBUTING.md).

{email_validator-2.1.0.post1 → email_validator-2.1.2}/README.md

@@ -12,8 +12,8 @@ necessarily for composing an email message, see below).
 
 Key features:
 
-* Checks that an email address has the correct syntax --- good for
-  registration/login forms or other uses related to identifying users.
+* Checks that an email address has the correct syntax --- great for
+  email-based registration/login forms or validing data.
 * Gives friendly English error messages when validation fails that you
   can display to end-users.
 * Checks deliverability (optional): Does the domain name resolve?
@@ -208,7 +208,7 @@ local parts, a wider range of Unicode characters are allowed.
 
 A surprisingly large number of Unicode characters are not safe to display,
 especially when the email address is concatenated with other text, so this
-library tries to protect you by not permitting resvered, non-, private use,
+library tries to protect you by not permitting reserved, non-, private use,
 formatting (which can be used to alter the display order of characters),
 whitespace, and control characters, and combining characters
 as the first character of the local part and the domain name (so that they
@@ -423,7 +423,6 @@ or likely to cause trouble:
   No one uses these forms anymore, and I can't think of any reason why anyone
   using this library would need to accept them.
 
-
 Testing
 -------
 
@@ -455,3 +454,8 @@ git tag v$(cat email_validator/version.py  | sed "s/.* = //" | sed 's/"//g')
 git push --tags
 ./release_to_pypi.sh
 ```
+
+License
+-------
+
+This project is free of any copyright restrictions per the [Unlicense](https://unlicense.org/). (Prior to Feb. 4, 2024, the project was made available under the terms of the [CC0 1.0 Universal public domain dedication](http://creativecommons.org/publicdomain/zero/1.0/).) See [LICENSE](LICENSE) and [CONTRIBUTING.md](CONTRIBUTING.md).

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Export the main method, helper methods, and the public data types.
 from .exceptions_types import ValidatedEmail, EmailNotValidError, \
                               EmailSyntaxError, EmailUndeliverableError

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/deliverability.py

@@ -1,16 +1,18 @@
 from typing import Optional, Any, Dict
 
+import ipaddress
+
 from .exceptions_types import EmailUndeliverableError
 
 import dns.resolver
 import dns.exception
 
 
-def caching_resolver(*, timeout: Optional[int] = None, cache=None):
+def caching_resolver(*, timeout: Optional[int] = None, cache=None, dns_resolver=None):
     if timeout is None:
         from . import DEFAULT_TIMEOUT
         timeout = DEFAULT_TIMEOUT
-    resolver = dns.resolver.Resolver()
+    resolver = dns_resolver or dns.resolver.Resolver()
     resolver.cache = cache or dns.resolver.LRUCache()  # type: ignore
     resolver.lifetime = timeout  # type: ignore # timeout, in seconds
     return resolver
@@ -57,10 +59,30 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
             deliverability_info["mx_fallback_type"] = None
 
         except dns.resolver.NoAnswer:
-            # If there was no MX record, fall back to an A record. (RFC 5321 Section 5)
+            # If there was no MX record, fall back to an A or AAA record
+            # (RFC 5321 Section 5). Check A first since it's more common.
+
+            # If the A/AAAA response has no Globally Reachable IP address,
+            # treat the response as if it were NoAnswer, i.e., the following
+            # address types are not allowed fallbacks: Private-Use, Loopback,
+            # Link-Local, and some other obscure ranges. See
+            # https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml
+            # https://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-special-registry.xhtml
+            # (Issue #134.)
+            def is_global_addr(ipaddr):
+                try:
+                    ipaddr = ipaddress.ip_address(ipaddr)
+                except ValueError:
+                    return False
+                return ipaddr.is_global
+
             try:
                 response = dns_resolver.resolve(domain, "A")
-                deliverability_info["mx"] = [(0, str(r)) for r in response]
+
+                if not any(is_global_addr(r.address) for r in response):
+                    raise dns.resolver.NoAnswer  # fall back to AAAA
+
+                deliverability_info["mx"] = [(0, domain)]
                 deliverability_info["mx_fallback_type"] = "A"
 
             except dns.resolver.NoAnswer:
@@ -69,15 +91,19 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
                 # (It's unclear if SMTP servers actually do this.)
                 try:
                     response = dns_resolver.resolve(domain, "AAAA")
-                    deliverability_info["mx"] = [(0, str(r)) for r in response]
+
+                    if not any(is_global_addr(r.address) for r in response):
+                        raise dns.resolver.NoAnswer
+
+                    deliverability_info["mx"] = [(0, domain)]
                     deliverability_info["mx_fallback_type"] = "AAAA"
 
-                except dns.resolver.NoAnswer:
+                except dns.resolver.NoAnswer as e:
                     # If there was no MX, A, or AAAA record, then mail to
                     # this domain is not deliverable, although the domain
                     # name has other records (otherwise NXDOMAIN would
                     # have been raised).
-                    raise EmailUndeliverableError(f"The domain name {domain_i18n} does not accept email.")
+                    raise EmailUndeliverableError(f"The domain name {domain_i18n} does not accept email.") from e
 
             # Check for a SPF (RFC 7208) reject-all record ("v=spf1 -all") which indicates
             # no emails are sent from this domain (similar to a Null MX record
@@ -96,10 +122,10 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
                 # No TXT records means there is no SPF policy, so we cannot take any action.
                 pass
 
-    except dns.resolver.NXDOMAIN:
+    except dns.resolver.NXDOMAIN as e:
         # The domain name does not exist --- there are no records of any sort
         # for the domain name.
-        raise EmailUndeliverableError(f"The domain name {domain_i18n} does not exist.")
+        raise EmailUndeliverableError(f"The domain name {domain_i18n} does not exist.") from e
 
     except dns.resolver.NoNameservers:
         # All nameservers failed to answer the query. This might be a problem
@@ -122,6 +148,6 @@ def validate_email_deliverability(domain: str, domain_i18n: str, timeout: Option
         # Unhandled conditions should not propagate.
         raise EmailUndeliverableError(
             "There was an error while checking if the domain name in the email address is deliverable: " + str(e)
-        )
+        ) from e
 
     return deliverability_info

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/exceptions_types.py

@@ -17,7 +17,7 @@ class EmailUndeliverableError(EmailNotValidError):
     pass
 
 
-class ValidatedEmail(object):
+class ValidatedEmail:
     """The validate_email function returns objects of this type holding the normalized form of the email address
     and other information."""
 
@@ -80,7 +80,6 @@ class ValidatedEmail(object):
 
     @property
     def email(self):
-        import warnings
         warnings.warn("ValidatedEmail.email is deprecated and will be removed, use ValidatedEmail.normalized instead", DeprecationWarning)
         return self.normalized
 
@@ -126,9 +125,7 @@ class ValidatedEmail(object):
     """This helps producing the README."""
     def as_constructor(self):
         return "ValidatedEmail(" \
-            + ",".join("\n  {}={}".format(
-                       key,
-                       repr(getattr(self, key)))
+            + ",".join(f"\n  {key}={repr(getattr(self, key))}"
                        for key in ('normalized', 'local_part', 'domain',
                                    'ascii_email', 'ascii_local_part', 'ascii_domain',
                                    'smtputf8', 'mx', 'mx_fallback_type')

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/rfc_constants.py

@@ -12,7 +12,7 @@ DOT_ATOM_TEXT = re.compile('[' + ATEXT + ']+(?:\\.[' + ATEXT + r']+)*\Z')
 # addresses to also include three specific ranges of UTF8 defined in
 # RFC 3629 section 4, which appear to be the Unicode code points from
 # U+0080 to U+10FFFF.
-ATEXT_INTL = ATEXT + u"\u0080-\U0010FFFF"
+ATEXT_INTL = ATEXT + "\u0080-\U0010FFFF"
 ATEXT_INTL_RE = re.compile('[.' + ATEXT_INTL + ']')  # ATEXT_INTL plus dots
 DOT_ATOM_TEXT_INTL = re.compile('[' + ATEXT_INTL + ']+(?:\\.[' + ATEXT_INTL + r']+)*\Z')
 
@@ -42,11 +42,11 @@ QTEXT_INTL = re.compile(r"[\u0020-\u007E\u0080-\U0010FFFF]")
 EMAIL_MAX_LENGTH = 254
 LOCAL_PART_MAX_LENGTH = 64
 DNS_LABEL_LENGTH_LIMIT = 63  # in "octets", RFC 1035 2.3.1
-DOMAIN_MAX_LENGTH = 255  # in "octets", RFC 1035 2.3.4 and RFC 5321 4.5.3.1.2
+DOMAIN_MAX_LENGTH = 253  # in "octets" as transmitted, RFC 1035 2.3.4 and RFC 5321 4.5.3.1.2, and see https://stackoverflow.com/questions/32290167/what-is-the-maximum-length-of-a-dns-name
 
 # RFC 2142
 CASE_INSENSITIVE_MAILBOX_NAMES = [
-    'info', 'marking', 'sales', 'support',  # section 3
+    'info', 'marketing', 'sales', 'support',  # section 3
     'abuse', 'noc', 'security',  # section 4
     'postmaster', 'hostmaster', 'usenet', 'news', 'webmaster', 'www', 'uucp', 'ftp',  # section 5
 ]

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/syntax.py

@@ -26,7 +26,6 @@ def split_email(email):
         # Since backslash-escaping is no longer needed because
         # the quotes are removed, remove backslash-escaping
         # to return in the normalized form.
-        import re
         local_part = re.sub(r"\\(.)", "\\1", local_part)
 
         return local_part, domain_part, True
@@ -72,14 +71,14 @@ def validate_email_local_part(local: str, allow_smtputf8: bool = True, allow_emp
     if len(local) == 0:
         if not allow_empty_local:
             raise EmailSyntaxError("There must be something before the @-sign.")
-        else:
-            # The caller allows an empty local part. Useful for validating certain
-            # Postfix aliases.
-            return {
-                "local_part": local,
-                "ascii_local_part": local,
-                "smtputf8": False,
-            }
+
+        # The caller allows an empty local part. Useful for validating certain
+        # Postfix aliases.
+        return {
+            "local_part": local,
+            "ascii_local_part": local,
+            "smtputf8": False,
+        }
 
     # Check the length of the local part by counting characters.
     # (RFC 5321 4.5.3.1.1)
@@ -124,11 +123,11 @@ def validate_email_local_part(local: str, allow_smtputf8: bool = True, allow_emp
             # Check for invalid characters against the non-internationalized
             # permitted character set.
             # (RFC 5322 3.2.3)
-            bad_chars = set(
+            bad_chars = {
                 safe_character_display(c)
                 for c in local
                 if not ATEXT_RE.match(c)
-            )
+            }
             if bad_chars:
                 raise EmailSyntaxError("Internationalized characters before the @-sign are not supported: " + ", ".join(sorted(bad_chars)) + ".")
 
@@ -148,20 +147,20 @@ def validate_email_local_part(local: str, allow_smtputf8: bool = True, allow_emp
         # (RFC 5321 4.1.2. RFC 5322 lists additional permitted *obsolete*
         # characters which are *not* allowed here. RFC 6531 section 3.3
         # extends the range to UTF8 strings.)
-        bad_chars = set(
+        bad_chars = {
             safe_character_display(c)
             for c in local
             if not QTEXT_INTL.match(c)
-        )
+        }
         if bad_chars:
             raise EmailSyntaxError("The email address contains invalid characters in quotes before the @-sign: " + ", ".join(sorted(bad_chars)) + ".")
 
         # See if any characters are outside of the ASCII range.
-        bad_chars = set(
+        bad_chars = {
             safe_character_display(c)
             for c in local
             if not (32 <= ord(c) <= 126)
-        )
+        }
         if bad_chars:
             requires_smtputf8 = True
 
@@ -191,8 +190,8 @@ def validate_email_local_part(local: str, allow_smtputf8: bool = True, allow_emp
         # want to have an unhandled exception later.
         try:
             local.encode("utf8")
-        except ValueError:
-            raise EmailSyntaxError("The email address contains an invalid character.")
+        except ValueError as e:
+            raise EmailSyntaxError("The email address contains an invalid character.") from e
 
         # If this address passes only by the quoted string form, re-quote it
         # and backslash-escape quotes and backslashes (removing any unnecessary
@@ -213,11 +212,11 @@ def validate_email_local_part(local: str, allow_smtputf8: bool = True, allow_emp
 
     # Check for invalid characters.
     # (RFC 5322 3.2.3, plus RFC 6531 3.3)
-    bad_chars = set(
+    bad_chars = {
         safe_character_display(c)
         for c in local
         if not ATEXT_INTL_RE.match(c)
-    )
+    }
     if bad_chars:
         raise EmailSyntaxError("The email address contains invalid characters before the @-sign: " + ", ".join(sorted(bad_chars)) + ".")
 
@@ -264,7 +263,7 @@ def check_unsafe_chars(s, allow_space=False):
             # as far as I can tell, but they violate the spirit of the non-internationalized
             # specification that email addresses do not contain line breaks when not quoted.
             bad_chars.add(c)
-        elif category[0] in ("C", "Z"):
+        elif category[0] == "C":
             # Control, format, surrogate, private use, and unassigned code points (C)
             # are all unsafe in various ways. Control and format characters can affect
             # text rendering if the email address is concatenated with other text.
@@ -306,11 +305,11 @@ def validate_email_domain_name(domain, test_environment=False, globally_delivera
 
     # Check for invalid characters before normalization.
     # (RFC 952 plus RFC 6531 section 3.3 for internationalized addresses)
-    bad_chars = set(
+    bad_chars = {
         safe_character_display(c)
         for c in domain
         if not ATEXT_HOSTNAME_INTL.match(c)
-    )
+    }
     if bad_chars:
         raise EmailSyntaxError("The part after the @-sign contains invalid characters: " + ", ".join(sorted(bad_chars)) + ".")
 
@@ -322,15 +321,17 @@ def validate_email_domain_name(domain, test_environment=False, globally_delivera
 
     # Perform UTS-46 normalization, which includes casefolding, NFC normalization,
     # and converting all label separators (the period/full stop, fullwidth full stop,
-    # ideographic full stop, and halfwidth ideographic full stop) to basic periods.
+    # ideographic full stop, and halfwidth ideographic full stop) to regular dots.
     # It will also raise an exception if there is an invalid character in the input,
-    # such as "⒈" which is invalid because it would expand to include a period.
+    # such as "⒈" which is invalid because it would expand to include a dot.
+    # Since several characters are normalized to a dot, this has to come before
+    # checks related to dots, like check_dot_atom which comes next.
     try:
         domain = idna.uts46_remap(domain, std3_rules=False, transitional=False)
     except idna.IDNAError as e:
-        raise EmailSyntaxError(f"The part after the @-sign contains invalid characters ({e}).")
+        raise EmailSyntaxError(f"The part after the @-sign contains invalid characters ({e}).") from e
 
-    # The domain part is made up period-separated "labels." Each label must
+    # The domain part is made up dot-separated "labels." Each label must
     # have at least one character and cannot start or end with dashes, which
     # means there are some surprising restrictions on periods and dashes.
     # Check that before we do IDNA encoding because the IDNA library gives
@@ -362,6 +363,8 @@ def validate_email_domain_name(domain, test_environment=False, globally_delivera
         # For ASCII-only domains, the transformation does nothing and is safe to
         # apply. However, to ensure we don't rely on the idna library for basic
         # syntax checks, we don't use it if it's not needed.
+        #
+        # uts46 is off here because it is handled above.
         try:
             ascii_domain = idna.encode(domain, uts46=False).decode("ascii")
         except idna.IDNAError as e:
@@ -370,8 +373,11 @@ def validate_email_domain_name(domain, test_environment=False, globally_delivera
                 # the length check is applied to a string that is different from the
                 # one the user supplied. Also I'm not sure if the length check applies
                 # to the internationalized form, the IDNA ASCII form, or even both!
-                raise EmailSyntaxError("The email address is too long after the @-sign.")
-            raise EmailSyntaxError(f"The part after the @-sign contains invalid characters ({e}).")
+                raise EmailSyntaxError("The email address is too long after the @-sign.") from e
+
+            # Other errors seem to not be possible because the call to idna.uts46_remap
+            # would have already raised them.
+            raise EmailSyntaxError(f"The part after the @-sign contains invalid characters ({e}).") from e
 
         # Check the syntax of the string returned by idna.encode.
         # It should never fail.
@@ -433,15 +439,15 @@ def validate_email_domain_name(domain, test_environment=False, globally_delivera
     try:
         domain_i18n = idna.decode(ascii_domain.encode('ascii'))
     except idna.IDNAError as e:
-        raise EmailSyntaxError(f"The part after the @-sign is not valid IDNA ({e}).")
+        raise EmailSyntaxError(f"The part after the @-sign is not valid IDNA ({e}).") from e
 
     # Check for invalid characters after normalization. These
     # should never arise. See the similar checks above.
-    bad_chars = set(
+    bad_chars = {
         safe_character_display(c)
         for c in domain
         if not ATEXT_HOSTNAME_INTL.match(c)
-    )
+    }
     if bad_chars:
         raise EmailSyntaxError("The part after the @-sign contains invalid characters: " + ", ".join(sorted(bad_chars)) + ".")
     check_unsafe_chars(domain)
@@ -511,7 +517,7 @@ def validate_email_domain_literal(domain_literal):
         try:
             addr = ipaddress.IPv4Address(domain_literal)
         except ValueError as e:
-            raise EmailSyntaxError(f"The address in brackets after the @-sign is not valid: It is not an IPv4 address ({e}) or is missing an address literal tag.")
+            raise EmailSyntaxError(f"The address in brackets after the @-sign is not valid: It is not an IPv4 address ({e}) or is missing an address literal tag.") from e
 
         # Return the IPv4Address object and the domain back unchanged.
         return {
@@ -524,7 +530,7 @@ def validate_email_domain_literal(domain_literal):
         try:
             addr = ipaddress.IPv6Address(domain_literal[5:])
         except ValueError as e:
-            raise EmailSyntaxError(f"The IPv6 address in brackets after the @-sign is not valid ({e}).")
+            raise EmailSyntaxError(f"The IPv6 address in brackets after the @-sign is not valid ({e}).") from e
 
         # Return the IPv6Address object and construct a normalized
         # domain literal.
@@ -544,11 +550,11 @@ def validate_email_domain_literal(domain_literal):
 
     # Check for permitted ASCII characters. This actually doesn't matter
     # since there will be an exception after anyway.
-    bad_chars = set(
+    bad_chars = {
         safe_character_display(c)
         for c in domain_literal
         if not DOMAIN_LITERAL_CHARS.match(c)
-    )
+    }
     if bad_chars:
         raise EmailSyntaxError("The part after the @-sign contains invalid characters in brackets: " + ", ".join(sorted(bad_chars)) + ".")
 

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator/validate_email.py

@@ -49,8 +49,8 @@ def validate_email(
     if not isinstance(email, str):
         try:
             email = email.decode("ascii")
-        except ValueError:
-            raise EmailSyntaxError("The email address is not valid ASCII.")
+        except ValueError as e:
+            raise EmailSyntaxError("The email address is not valid ASCII.") from e
 
     # Split the address into the local part (before the @-sign)
     # and the domain part (after the @-sign). Normally, there

email_validator-2.1.2/email_validator/version.py

@@ -0,0 +1 @@
+__version__ = "2.1.2"

{email_validator-2.1.0.post1 → email_validator-2.1.2}/email_validator.egg-info/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
-Name: email-validator
-Version: 2.1.0.post1
+Name: email_validator
+Version: 2.1.2
 Summary: A robust email address syntax and deliverability validation library.
 Home-page: https://github.com/JoshData/python-email-validator
 Author: Joshua Tauberer
 Author-email: jt@occams.info
-License: CC0 (copyright waived)
+License: Unlicense
 Keywords: email address validator
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
+Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
@@ -37,8 +37,8 @@ necessarily for composing an email message, see below).
 
 Key features:
 
-* Checks that an email address has the correct syntax --- good for
-  registration/login forms or other uses related to identifying users.
+* Checks that an email address has the correct syntax --- great for
+  email-based registration/login forms or validing data.
 * Gives friendly English error messages when validation fails that you
   can display to end-users.
 * Checks deliverability (optional): Does the domain name resolve?
@@ -233,7 +233,7 @@ local parts, a wider range of Unicode characters are allowed.
 
 A surprisingly large number of Unicode characters are not safe to display,
 especially when the email address is concatenated with other text, so this
-library tries to protect you by not permitting resvered, non-, private use,
+library tries to protect you by not permitting reserved, non-, private use,
 formatting (which can be used to alter the display order of characters),
 whitespace, and control characters, and combining characters
 as the first character of the local part and the domain name (so that they
@@ -448,7 +448,6 @@ or likely to cause trouble:
   No one uses these forms anymore, and I can't think of any reason why anyone
   using this library would need to accept them.
 
-
 Testing
 -------
 
@@ -480,3 +479,8 @@ git tag v$(cat email_validator/version.py  | sed "s/.* = //" | sed 's/"//g')
 git push --tags
 ./release_to_pypi.sh
 ```
+
+License
+-------
+
+This project is free of any copyright restrictions per the [Unlicense](https://unlicense.org/). (Prior to Feb. 4, 2024, the project was made available under the terms of the [CC0 1.0 Universal public domain dedication](http://creativecommons.org/publicdomain/zero/1.0/).) See [LICENSE](LICENSE) and [CONTRIBUTING.md](CONTRIBUTING.md).

{email_validator-2.1.0.post1 → email_validator-2.1.2}/pyproject.toml

@@ -1,4 +1,4 @@
 [tool.pytest.ini_options]
 markers = [
     "network: marks tests as requiring Internet access",
-]
+]

{email_validator-2.1.0.post1 → email_validator-2.1.2}/setup.cfg

@@ -7,12 +7,12 @@ long_description_content_type = text/markdown
 url = https://github.com/JoshData/python-email-validator
 author = Joshua Tauberer
 author_email = jt@occams.info
-license = CC0 (copyright waived)
+license = Unlicense
 license_files = LICENSE
 classifiers = 
 	Development Status :: 5 - Production/Stable
 	Intended Audience :: Developers
-	License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
+	License :: OSI Approved :: The Unlicense (Unlicense)
 	Programming Language :: Python :: 3
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9

{email_validator-2.1.0.post1 → email_validator-2.1.2}/tests/mocked-dns-answers.json

@@ -7,20 +7,41 @@
   },
   "answer": [
    "10 alt1.gmail-smtp-in.l.google.com.",
-   "30 alt3.gmail-smtp-in.l.google.com.",
-   "5 gmail-smtp-in.l.google.com.",
    "20 alt2.gmail-smtp-in.l.google.com.",
-   "40 alt4.gmail-smtp-in.l.google.com."
+   "30 alt3.gmail-smtp-in.l.google.com.",
+   "40 alt4.gmail-smtp-in.l.google.com.",
+   "5 gmail-smtp-in.l.google.com."
   ]
  },
  {
   "query": {
-   "name": "xkxufoekjvjfjeodlfmdfjcu.com",
+   "name": "pages.github.com",
    "type": "MX",
    "class": "IN"
   },
   "answer": []
  },
+ {
+  "query": {
+   "name": "pages.github.com",
+   "type": "A",
+   "class": "IN"
+  },
+  "answer": [
+   "185.199.108.153",
+   "185.199.109.153",
+   "185.199.110.153",
+   "185.199.111.153"
+  ]
+ },
+ {
+  "query": {
+   "name": "pages.github.com",
+   "type": "TXT",
+   "class": "IN"
+  },
+  "answer": []
+ },
  {
   "query": {
    "name": "xkxufoekjvjfjeodlfmdfjcu.com",
@@ -39,6 +60,32 @@
    "0 ."
   ]
  },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "MX",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "A",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "g.mail.com",
+   "type": "AAAA",
+   "class": "IN"
+  },
+  "answer": [
+   "::1"
+  ]
+ },
  {
   "query": {
    "name": "nellis.af.mil",
@@ -64,13 +111,13 @@
    "class": "IN"
   },
   "answer": [
-   "\"v=spf1 -all\"",
-   "\"MS=ms47108184\""
+   "\"MS=ms47108184\"",
+   "\"v=spf1 -all\""
   ]
  },
  {
   "query": {
-   "name": "mail.example",
+   "name": "justtxt.joshdata.me",
    "type": "MX",
    "class": "IN"
   },
@@ -78,16 +125,24 @@
  },
  {
   "query": {
-   "name": "mail.example",
-   "type": "ANY",
+   "name": "justtxt.joshdata.me",
+   "type": "A",
    "class": "IN"
   },
   "answer": []
  },
  {
   "query": {
-   "name": "mail.example.com",
-   "type": "MX",
+   "name": "justtxt.joshdata.me",
+   "type": "AAAA",
+   "class": "IN"
+  },
+  "answer": []
+ },
+ {
+  "query": {
+   "name": "mail.example",
+   "type": "ANY",
    "class": "IN"
   },
   "answer": []

{email_validator-2.1.0.post1 → email_validator-2.1.2}/tests/mocked_dns_response.py

@@ -32,7 +32,8 @@ class MockedDnsResponseData:
 
         # Return a new dns.resolver.Resolver configured for caching
         # using the singleton instance.
-        return caching_resolver(cache=MockedDnsResponseData.INSTANCE)
+        dns_resolver = dns.resolver.Resolver(configure=BUILD_MOCKED_DNS_RESPONSE_DATA)
+        return caching_resolver(cache=MockedDnsResponseData.INSTANCE, dns_resolver=dns_resolver)
 
     def __init__(self):
         self.data = {}
@@ -72,10 +73,10 @@ class MockedDnsResponseData:
                     "type": dns.rdatatype.to_text(key[1]),
                     "class": dns.rdataclass.to_text(key[2]),
                 },
-                "answer": [
+                "answer": sorted([
                     rr.to_text()
                     for rr in value
-                ]
+                ])
             }
             for key, value in self.data.items()
         ]

{email_validator-2.1.0.post1 → email_validator-2.1.2}/tests/test_deliverability.py

@@ -10,30 +10,33 @@ from mocked_dns_response import MockedDnsResponseData, MockedDnsResponseDataClea
 RESOLVER = MockedDnsResponseData.create_resolver()
 
 
-def test_deliverability_found():
-    response = validate_email_deliverability('gmail.com', 'gmail.com', dns_resolver=RESOLVER)
-    assert response.keys() == {'mx', 'mx_fallback_type'}
-    assert response['mx_fallback_type'] is None
-    assert len(response['mx']) > 1
-    assert len(response['mx'][0]) == 2
-    assert isinstance(response['mx'][0][0], int)
-    assert response['mx'][0][1].endswith('.com')
-
-
-def test_deliverability_fails():
-    # No MX record.
-    domain = 'xkxufoekjvjfjeodlfmdfjcu.com'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not exist'):
-        validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
+@pytest.mark.parametrize(
+    'domain,expected_response',
+    [
+        ('gmail.com', {'mx': [(5, 'gmail-smtp-in.l.google.com'), (10, 'alt1.gmail-smtp-in.l.google.com'), (20, 'alt2.gmail-smtp-in.l.google.com'), (30, 'alt3.gmail-smtp-in.l.google.com'), (40, 'alt4.gmail-smtp-in.l.google.com')], 'mx_fallback_type': None}),
+        ('pages.github.com', {'mx': [(0, 'pages.github.com')], 'mx_fallback_type': 'A'}),
+    ],
+)
+def test_deliverability_found(domain, expected_response):
+    response = validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
+    assert response == expected_response
 
-    # Null MX record.
-    domain = 'example.com'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not accept email'):
-        validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
 
-    # No MX record, A record fallback, reject-all SPF record.
-    domain = 'nellis.af.mil'
-    with pytest.raises(EmailUndeliverableError, match=f'The domain name {domain} does not send email'):
+@pytest.mark.parametrize(
+    'domain,error',
+    [
+        ('xkxufoekjvjfjeodlfmdfjcu.com', 'The domain name {domain} does not exist'),
+        ('example.com', 'The domain name {domain} does not accept email'),  # Null MX record
+        ('g.mail.com', 'The domain name {domain} does not accept email'),  # No MX record but invalid AAAA record fallback (issue #134)
+        ('nellis.af.mil', 'The domain name {domain} does not send email'),  # No MX record, A record fallback, reject-all SPF record.
+
+        # No MX or A/AAAA records, but some other DNS records must
+        # exist such that the response is NOANSWER instead of NXDOMAIN.
+        ('justtxt.joshdata.me', 'The domain name {domain} does not accept email'),
+    ],
+)
+def test_deliverability_fails(domain, error):
+    with pytest.raises(EmailUndeliverableError, match=error.format(domain=domain)):
         validate_email_deliverability(domain, domain, dns_resolver=RESOLVER)
 
 

{email_validator-2.1.0.post1 → email_validator-2.1.2}/tests/test_syntax.py

@@ -68,15 +68,41 @@ from email_validator import EmailSyntaxError, \
                 ascii_email='jeff@xn--fiqq24b10vi0d.tw',
             ),
         ),
+        (
+            '"quoted local part"@example.org',
+            ValidatedEmail(
+                local_part='"quoted local part"',
+                ascii_local_part='"quoted local part"',
+                smtputf8=False,
+                ascii_domain='example.org',
+                domain='example.org',
+                normalized='"quoted local part"@example.org',
+                ascii_email='"quoted local part"@example.org'
+            ),
+        ),
+        (
+            '"de-quoted.local.part"@example.org',
+            ValidatedEmail(
+                local_part='de-quoted.local.part',
+                ascii_local_part='de-quoted.local.part',
+                smtputf8=False,
+                ascii_domain='example.org',
+                domain='example.org',
+                normalized='de-quoted.local.part@example.org',
+                ascii_email='de-quoted.local.part@example.org'
+            ),
+        ),
     ],
 )
 def test_email_valid(email_input, output):
     # These addresses do not require SMTPUTF8. See test_email_valid_intl_local_part
     # for addresses that are valid but require SMTPUTF8. Check that it passes with
     # allow_smtput8 both on and off.
-    emailinfo = validate_email(email_input, check_deliverability=False, allow_smtputf8=False)
+    emailinfo = validate_email(email_input, check_deliverability=False, allow_smtputf8=False,
+                               allow_quoted_local=True)
     assert emailinfo == output
-    assert validate_email(email_input, check_deliverability=False, allow_smtputf8=True) == output
+    assert validate_email(email_input, check_deliverability=False, allow_smtputf8=True,
+                          allow_quoted_local=True) == output
 
     # Check that the old `email` attribute to access the normalized form still works
     # if the DeprecationWarning is suppressed.
@@ -317,9 +343,9 @@ def test_domain_literal():
         ('obsolete."quoted".atom@example.com', 'The email address contains invalid characters before the @-sign: \'"\'.'),
         ('11111111112222222222333333333344444444445555555555666666666677777@example.com', 'The email address is too long before the @-sign (1 character too many).'),
         ('111111111122222222223333333333444444444455555555556666666666777777@example.com', 'The email address is too long before the @-sign (2 characters too many).'),
-        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.111111111122222222223333333333444444444455555555556.com', 'The email address is too long (4 characters too many).'),
-        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555566.com', 'The email address is too long after the @-sign (1 character too many).'),
-        ('me@中1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555566.com', 'The email address is too long after the @-sign.'),
+        ('meme@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.com', 'The email address is too long (4 characters too many).'),
+        ('me@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333333344444444445555555555.com', 'The email address is too long after the @-sign (1 character too many).'),
+        ('me@中1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444.com', 'The email address is too long after the @-sign.'),
         ('my.long.address@1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333333344444.info', 'The email address is too long (2 characters too many).'),
         ('my.long.address@λ111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.11111111112222222222333333.info', 'The email address is too long (when converted to IDNA ASCII).'),
         ('my.long.address@λ111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444444444555555555.6666666666777777777788888888889999999999000000000.1111111111222222222233333333334444.info', 'The email address is too long (at least 1 character too many).'),

email_validator-2.1.0.post1/LICENSE

@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.

email_validator-2.1.0.post1/email_validator/version.py

@@ -1 +0,0 @@
-__version__ = "2.1.0.post1"