From 6e4c6281dbb7ee12bcdc22620894edb4e9cf623f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 7 Sep 2017 08:16:21 -0400 Subject: Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()." This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better. --- django/core/validators.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django/core/validators.py') diff --git a/django/core/validators.py b/django/core/validators.py index c6d5e6e06a..b36ab60704 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -1,7 +1,6 @@ import ipaddress import os import re -from contextlib import suppress from urllib.parse import urlsplit, urlunsplit from django.core.exceptions import ValidationError @@ -215,9 +214,11 @@ class EmailValidator: literal_match = self.literal_regex.match(domain_part) if literal_match: ip_address = literal_match.group(1) - with suppress(ValidationError): + try: validate_ipv46_address(ip_address) return True + except ValidationError: + pass return False def __eq__(self, other): -- cgit v1.3