Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #12988 -- Extended regular expression of the URLValidator to fu…

…lly support IDN-URLs, especially the long TLDs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 47b1a8e704b375f0b4f79db8432e4373d33e746d 1 parent ff4a24a
@jezdez jezdez authored
View
2  django/core/validators.py
@@ -46,7 +46,7 @@ def get_method(self):
class URLValidator(RegexValidator):
regex = re.compile(
r'^https?://' # http:// or https://
- r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?|' #domain...
+ r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain...
r'localhost|' #localhost...
r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
r'(?::\d+)?' # optional port
View
35 tests/regressiontests/forms/tests/fields.py
@@ -571,13 +571,6 @@ def test_urlfield_3(self):
f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
except ValidationError, e:
self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
- # Valid and existent IDN
- self.assertEqual(u'http://\u05e2\u05d1\u05e8\u05d9\u05ea.idn.icann.org/', f.clean(u'http://עברית.idn.icann.org/'))
- # Valid but non-existent IDN
- try:
- f.clean(u'http://broken.עברית.idn.icann.org/')
- except ValidationError, e:
- self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
def test_urlfield_4(self):
f = URLField(verify_exists=True, required=False)
@@ -601,10 +594,36 @@ def test_urlfield_7(self):
self.assertEqual(u'http://example.com/', f.clean('http://example.com'))
self.assertEqual(u'http://example.com/test', f.clean('http://example.com/test'))
- def test_urlfield_ticket11826(self):
+ def test_urlfield_8(self):
+ # ticket #11826
f = URLField()
self.assertEqual(u'http://example.com/?some_param=some_value', f.clean('http://example.com?some_param=some_value'))
+ def test_urlfield_9(self):
+ f = URLField(verify_exists=False)
+ urls = (
+ u'http://עברית.idn.icann.org/',
+ u'http://sãopaulo.com/',
+ u'http://sãopaulo.com.br/',
+ u'http://пример.испытание/',
+ u'http://مثال.إختبار/',
+ u'http://例子.测试/',
+ u'http://例子.測試/',
+ u'http://उदाहरण.परीक्षा/',
+ u'http://例え.テスト/',
+ u'http://مثال.آزمایشی/',
+ u'http://실례.테스트/',
+ u'http://العربية.idn.icann.org/',
+ )
+ for url in urls:
+ # Valid and existent IDN
+ self.assertEqual(url, f.clean(url))
+ # Valid but non-existent IDN
+ try:
+ f.clean(u'http://broken.עברית.idn.icann.org/')
+ except ValidationError, e:
+ self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+
# BooleanField ################################################################
def test_booleanfield_1(self):

0 comments on commit 47b1a8e

Please sign in to comment.
Something went wrong with that request. Please try again.