Ticket #13728: 13728_correct_default_value.diff

forms/fields.py

@@ -529 +529 @@
         'invalid_link': _(u'This URL appears to be a broken link.'),
     }
 
-    def __init__(self, max_length=None, min_length=None, verify_exists=False,
+    def __init__(self, max_length=None, min_length=None, verify_exists=True,
             validator_user_agent=validators.URL_VALIDATOR_USER_AGENT, *args, **kwargs):
         super(URLField, self).__init__(max_length, min_length, *args,
                                        **kwargs)

core/validators.py

@@ -47 +47 @@
         r'(?::\d+)?' # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
 
-    def __init__(self, verify_exists=False, validator_user_agent=URL_VALIDATOR_USER_AGENT):
+    def __init__(self, verify_exists=True, validator_user_agent=URL_VALIDATOR_USER_AGENT):
         super(URLValidator, self).__init__()
         self.verify_exists = verify_exists
         self.user_agent = validator_user_agent
@@ -82 +82 @@
             }
             try:
                 req = urllib2.Request(url, None, headers)
-                u = urllib2.urlopen(req)
+                urllib2.urlopen(req)
             except ValueError:
                 raise ValidationError(_(u'Enter a valid URL.'), code='invalid')
             except: # urllib2.URLError, httplib.InvalidURL, etc.
@@ -106 +106 @@
                 parts = value.split(u'@')
                 domain_part = parts[-1]
                 try:
-                    parts[-1] = parts[-1].encode('idna')
+                    domain_part = domain_part.encode('idna')
                 except UnicodeError:
                     raise e
                 super(EmailValidator, self).__call__(u'@'.join(parts))