summaryrefslogtreecommitdiff
path: root/django/core/validators.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-09-07 08:16:21 -0400
committerGitHub <noreply@github.com>2017-09-07 08:16:21 -0400
commit6e4c6281dbb7ee12bcdc22620894edb4e9cf623f (patch)
tree1c21218d4b6f00c499f18943d5190ebe7b5248c9 /django/core/validators.py
parent8b2515a450ef376b9205029090af0a79c8341bd7 (diff)
Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()."
This reverts commit 550cb3a365dee4edfdd1563224d5304de2a57fda because try/except performs better.
Diffstat (limited to 'django/core/validators.py')
-rw-r--r--django/core/validators.py5
1 files changed, 3 insertions, 2 deletions
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):