Browse files

Commit changes resulting from build.

  • Loading branch information...
1 parent 42c0ace commit fc322e04fbb4d672e1e320e232ce621f93e9c4ac @ieure committed Oct 22, 2010
View
8 docs/man/django-admin.1
@@ -1,8 +1,8 @@
-.TH "django-admin.py" "1" "March 2008" "Django Project" ""
+.TH "django-admin" "1" "March 2008" "Django Project" ""
.SH "NAME"
-django\-admin.py \- Utility script for the Django web framework
+django\-admin \- Utility script for the Django web framework
.SH "SYNOPSIS"
-.B django\-admin.py
+.B django\-admin
.I <action>
.B [options]
.sp
@@ -153,7 +153,7 @@ The domain of the message files (default: "django") when using makemessages.
.TP
.I \-e, \-\-extension=EXTENSION
The file extension(s) to examine (default: ".html", separate multiple
-extensions with commas, or use -e multiple times).
+extensions with commas, or use \-e multiple times).
.TP
.I \-e, \-\-symlinks
Follows symlinks to directories when examining source code and templates for
View
4 tests/modeltests/validation/tests.py
@@ -56,10 +56,6 @@ def test_correct_url_but_nonexisting_gives_404(self):
mtv = ModelToValidate(number=10, name='Some Name', url='http://google.com/we-love-microsoft.html')
self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'This URL appears to be a broken link.'])
- def test_correct_url_value_passes(self):
- mtv = ModelToValidate(number=10, name='Some Name', url='http://www.djangoproject.com/')
- self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
-
def test_text_greater_that_charfields_max_length_eaises_erros(self):
mtv = ModelToValidate(number=10, name='Some Name'*100)
self.assertFailsValidation(mtv.full_clean, ['name',])
View
19 tests/regressiontests/admin_views/tests.py
@@ -2206,16 +2206,19 @@ def test_tags(self):
self.assertContains(response, "<h2>Built-in tags</h2>", count=2)
# A builtin tag exists in both the index and detail
- self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
- self.assertContains(response, '<li><a href="#autoescape">autoescape</a></li>')
+ self.assertContains(response, '<h3 id="built_in-autoescape">autoescape</h3>')
+ self.assertContains(response, '<li><a href="#built_in-autoescape">autoescape</a></li>')
# An app tag exists in both the index and detail
- # The builtin tag group exists
+ self.assertContains(response, '<h3 id="comments-get_comment_count">get_comment_count</h3>')
+ self.assertContains(response, '<li><a href="#comments-get_comment_count">get_comment_count</a></li>')
+
+ # The admin list tag group exists
self.assertContains(response, "<h2>admin_list</h2>", count=2)
- # A builtin tag exists in both the index and detail
- self.assertContains(response, '<h3 id="autoescape">autoescape</h3>')
- self.assertContains(response, '<li><a href="#admin_actions">admin_actions</a></li>')
+ # An admin list tag exists in both the index and detail
+ self.assertContains(response, '<h3 id="admin_list-admin_actions">admin_actions</h3>')
+ self.assertContains(response, '<li><a href="#admin_list-admin_actions">admin_actions</a></li>')
def test_filters(self):
response = self.client.get('/test_admin/admin/doc/filters/')
@@ -2224,8 +2227,8 @@ def test_filters(self):
self.assertContains(response, "<h2>Built-in filters</h2>", count=2)
# A builtin filter exists in both the index and detail
- self.assertContains(response, '<h3 id="add">add</h3>')
- self.assertContains(response, '<li><a href="#add">add</a></li>')
+ self.assertContains(response, '<h3 id="built_in-add">add</h3>')
+ self.assertContains(response, '<li><a href="#built_in-add">add</a></li>')
except ImportError:
pass
View
27 tests/regressiontests/forms/fields.py
@@ -513,33 +513,6 @@ def test_urlfield_38(self):
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
- def test_urlfield_39(self):
- f = URLField(verify_exists=True)
- self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
- self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
- self.assertRaises(ValidationError, f.clean, 'http://www.broken.djangoproject.com') # bad domain
- try:
- f.clean('http://www.broken.djangoproject.com') # bad domain
- except ValidationError, e:
- self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
- self.assertRaises(ValidationError, f.clean, 'http://google.com/we-love-microsoft.html') # good domain, bad page
- try:
- 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_40(self):
- f = URLField(verify_exists=True, required=False)
- self.assertEqual(u'', f.clean(''))
- self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
-
def test_urlfield_41(self):
f = URLField(min_length=15, max_length=20)
self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')

0 comments on commit fc322e0

Please sign in to comment.