Remove Python 2.x shims and tests since Py2 is not supported anymore

See d7fd074.

Author: JoshData

README.md

@@ -251,16 +251,6 @@ part is converted to [IDNA ASCII](https://tools.ietf.org/html/rfc5891).
 (You probably should not do this at account creation time so you don't
 change the user's login information without telling them.)
 
-### Support for Python 2.7
-
-The last version of this library supporting Python 2.x is version 1.2.1.
-
-When using Python 2.x, it is required that it was built with
-UCS-4 support (see
-[here](https://stackoverflow.com/questions/29109944/python-returns-length-of-2-for-single-unicode-character-string)).
-Without UCS-4 support, unicode characters outside of the BMP (Basic
-Multilingual Plane) will not validate correctly.
-
 Normalization
 -------------
 
@@ -407,6 +397,17 @@ or likely to cause trouble:
   IP address in brackets) is rejected. Other obsolete and deprecated syntaxes are
   rejected. No one uses these forms anymore.
 
+Support for Python 2.x
+----------------------
+
+The last version of this library supporting Python 2.x is version 1.2.1.
+
+When using Python 2.x, it is required that Python be built with
+UCS-4 support (see
+[here](https://stackoverflow.com/questions/29109944/python-returns-length-of-2-for-single-unicode-character-string)).
+Without UCS-4 support, unicode characters outside of the BMP (Basic
+Multilingual Plane) will not validate correctly in internationalized addresses.
+
 Testing
 -------
 

email_validator/__main__.py

@@ -17,36 +17,24 @@
 from .exceptions_types import EmailNotValidError
 
 
-def __utf8_input_shim(input_str):
-    if sys.version_info < (3,):
-        return input_str.decode("utf-8")
-    return input_str
-
-
-def __utf8_output_shim(output_str):
-    if sys.version_info < (3,):
-        return unicode_class(output_str).encode("utf-8")
-    return output_str
-
-
 def main():
     if len(sys.argv) == 1:
         # Validate the email addresses pased line-by-line on STDIN.
         dns_resolver = caching_resolver()
         for line in sys.stdin:
-            email = __utf8_input_shim(line.strip())
+            email = line.strip()
             try:
                 validate_email(email, dns_resolver=dns_resolver)
             except EmailNotValidError as e:
-                print(__utf8_output_shim("{} {}".format(email, e)))
+                print("{} {}".format(email, e))
     else:
         # Validate the email address passed on the command line.
-        email = __utf8_input_shim(sys.argv[1])
+        email = sys.argv[1]
         try:
             result = validate_email(email)
             print(json.dumps(result.as_dict(), indent=2, sort_keys=True, ensure_ascii=False))
         except EmailNotValidError as e:
-            print(__utf8_output_shim(e))
+            print(e)
 
 
 if __name__ == "__main__":

email_validator/rfc_constants.py

@@ -1,5 +1,3 @@
-import sys
-
 # These constants are defined by the email specifications.
 
 # Based on RFC 2822 section 3.2.4 / RFC 5322 section 3.2.3, these
@@ -29,11 +27,3 @@
 EMAIL_MAX_LENGTH = 254
 LOCAL_PART_MAX_LENGTH = 64
 DOMAIN_MAX_LENGTH = 255
-
-
-# In Python 2.x, turn the regexes above from bytes regexes into unicode
-# regexes. If Python 3.x had a "ur" string literal prefix we'd use that instead.
-if sys.version_info < (3,):
-    ATEXT = ATEXT.decode("ascii")
-    DOT_ATOM_TEXT = DOT_ATOM_TEXT.decode("ascii")
-    ATEXT_HOSTNAME = ATEXT_HOSTNAME.decode("ascii")

email_validator/validate_email.py

@@ -1,16 +1,8 @@
-import sys
-
 from .exceptions_types import EmailSyntaxError, ValidatedEmail
 from .syntax import validate_email_local_part, validate_email_domain_part, get_length_reason
 from .deliverability import validate_email_deliverability
 from .rfc_constants import EMAIL_MAX_LENGTH
 
-# ease compatibility in type checking
-if sys.version_info >= (3,):
-    unicode_class = str
-else:
-    unicode_class = unicode  # noqa: F821
-
 
 def validate_email(
     email,
@@ -46,7 +38,7 @@ def validate_email(
     # Allow email to be a str or bytes instance. If bytes,
     # it must be ASCII because that's how the bytes work
     # on the wire with SMTP.
-    if not isinstance(email, (str, unicode_class)):
+    if not isinstance(email, str):
         try:
             email = email.decode("ascii")
         except ValueError:

tests/test_main.py

@@ -591,31 +591,6 @@ def test_main_multi_input(monkeypatch, capsys):
     assert test_cases[3] in stdout
 
 
-def test_main_input_shim(monkeypatch, capsys):
-    import json
-    monkeypatch.setattr('sys.version_info', (2, 7))
-    test_email = b"google@google.com"
-    monkeypatch.setattr('sys.argv', ['email_validator', test_email])
-    validator_command_line_tool()
-    stdout, _ = capsys.readouterr()
-    output = json.loads(str(stdout))
-    assert isinstance(output, dict)
-    assert validate_email(test_email).original_email == output["original_email"]
-
-
-def test_main_output_shim(monkeypatch, capsys):
-    monkeypatch.setattr('sys.version_info', (2, 7))
-    test_email = b"test@.com"
-    monkeypatch.setattr('sys.argv', ['email_validator', test_email])
-    validator_command_line_tool()
-    stdout, _ = capsys.readouterr()
-
-    # This looks bad but it has to do with the way python 2.7 prints vs py3
-    # The \n is part of the print statement, not part of the string, which is what the b'...' is
-    # Since we're mocking py 2.7 here instead of actually using 2.7, this was the closest I could get
-    assert stdout == "b'An email address cannot have a period immediately after the @-sign.'\n"
-
-
 def test_validate_email__with_caching_resolver():
     # unittest.mock.patch("dns.resolver.LRUCache.get") doesn't
     # work --- it causes get to always return an empty list.