summaryrefslogtreecommitdiff
path: root/django/core/validators.py
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-03-09 16:17:41 +0100
committerTim Graham <timograham@gmail.com>2017-06-28 14:07:55 -0400
commit550cb3a365dee4edfdd1563224d5304de2a57fda (patch)
treefb532f38774ff7619edd2a4532c3daae1ee0ac5a /django/core/validators.py
parent43a4835edf32c57eb74c0eb207c276734a34abcf (diff)
Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().
Diffstat (limited to 'django/core/validators.py')
-rw-r--r--django/core/validators.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/django/core/validators.py b/django/core/validators.py
index 1a36246171..bfeaa2c7dc 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -1,6 +1,7 @@
import ipaddress
import os
import re
+from contextlib import suppress
from urllib.parse import urlsplit, urlunsplit
from django.core.exceptions import ValidationError
@@ -200,10 +201,11 @@ class EmailValidator:
# Try for possible IDN domain-part
try:
domain_part = domain_part.encode('idna').decode('ascii')
- if self.validate_domain_part(domain_part):
- return
except UnicodeError:
pass
+ else:
+ if self.validate_domain_part(domain_part):
+ return
raise ValidationError(self.message, code=self.code)
def validate_domain_part(self, domain_part):
@@ -213,11 +215,9 @@ class EmailValidator:
literal_match = self.literal_regex.match(domain_part)
if literal_match:
ip_address = literal_match.group(1)
- try:
+ with suppress(ValidationError):
validate_ipv46_address(ip_address)
return True
- except ValidationError:
- pass
return False
def __eq__(self, other):