[Python-modules-commits] r18527 - in packages/python-django/trunk/debian (6 files)
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Thu Sep 15 08:29:28 UTC 2011
Date: Thursday, September 15, 2011 @ 08:29:26
Author: hertzog
Revision: 18527
* New upstream release. It includes security updates described here:
https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
Closes: #641405
* Update 01_disable_url_verify_regression_tests.diff and merge
07_disable_url_verify_model_tests.diff into it.
* Update patch headers to conform to DEP-3.
Modified:
packages/python-django/trunk/debian/changelog
packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
packages/python-django/trunk/debian/patches/03_manpage.diff
packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
packages/python-django/trunk/debian/patches/series
Deleted:
packages/python-django/trunk/debian/patches/07_disable_url_verify_model_tests.diff
Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/changelog 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,3 +1,14 @@
+python-django (1.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release. It includes security updates described here:
+ https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
+ Closes: #641405
+ * Update 01_disable_url_verify_regression_tests.diff and merge
+ 07_disable_url_verify_model_tests.diff into it.
+ * Update patch headers to conform to DEP-3.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Thu, 15 Sep 2011 09:37:26 +0200
+
python-django (1.3-2) unstable; urgency=low
* Team upload.
Modified: packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,13 +1,60 @@
-Forwarded-Upstream: not needed
+Description: Drop regression tests that require an internet connection
+ This is a Debian specific patch because source packages should be
+ buildable without any internet connection.
Author: Chris Lamb <lamby at debian.org>
-Comment:
- Disable regression tests that require an internet connection.
- .
- This is a Debian specific patch.
+Author: Evgeni Golov <evgeni at debian.org>
+Forwarded: not-needed
+Origin: vendor
+--- a/tests/regressiontests/forms/tests/error_messages.py
++++ b/tests/regressiontests/forms/tests/error_messages.py
+@@ -139,17 +139,6 @@ class FormsErrorMessagesTestCase(unittes
+ self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
+ self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
+
+- def test_urlfield(self):
+- e = {
+- 'required': 'REQUIRED',
+- 'invalid': 'INVALID',
+- 'invalid_link': 'INVALID LINK',
+- }
+- f = URLField(verify_exists=True, error_messages=e)
+- self.assertFormErrors([u'REQUIRED'], f.clean, '')
+- self.assertFormErrors([u'INVALID'], f.clean, 'abc.c')
+- self.assertFormErrors([u'INVALID LINK'], f.clean, 'http://www.broken.djangoproject.com')
+-
+ def test_booleanfield(self):
+ e = {
+ 'required': 'REQUIRED',
+--- a/tests/modeltests/validation/tests.py
++++ b/tests/modeltests/validation/tests.py
+@@ -53,23 +53,6 @@ class BaseModelValidationTests(Validatio
+ mtv = ModelToValidate(number=10, name='Some Name', url='not a url')
+ self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'Enter a valid value.'])
+
+- #The tests below which use url_verify are deprecated
+- def test_correct_url_but_nonexisting_gives_404(self):
+- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://qa-dev.w3.org/link-testsuite/http.php?code=404')
+- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url_verify', [u'This URL appears to be a broken link.'])
+-
+- def test_correct_url_value_passes(self):
+- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://www.google.com/')
+- self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
+-
+- def test_correct_url_with_redirect(self):
+- mtv = ModelToValidate(number=10, name='Some Name', url_verify='http://qa-dev.w3.org/link-testsuite/http.php?code=301') #example.com is a redirect to iana.org now
+- self.assertEqual(None, mtv.full_clean()) # This will fail if there's no Internet connection
+-
+- def test_correct_https_url_but_nonexisting(self):
+- mtv = ModelToValidate(number=10, name='Some Name', url_verify='https://www.example.com/')
+- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url_verify', [u'This URL appears to be a broken link.'])
+-
+ def test_text_greater_that_charfields_max_length_raises_erros(self):
+ mtv = ModelToValidate(number=10, name='Some Name'*100)
+ self.assertFailsValidation(mtv.full_clean, ['name',])
--- a/tests/regressiontests/forms/tests/fields.py
+++ b/tests/regressiontests/forms/tests/fields.py
-@@ -557,27 +557,6 @@
+@@ -557,27 +557,6 @@ class FieldsTests(TestCase):
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
@@ -21,7 +68,7 @@
- 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
+- self.assertRaises(ValidationError, f.clean, 'http://qa-dev.w3.org/link-testsuite/http.php?code=400') # good domain, bad page
- try:
- f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
- except ValidationError, e:
@@ -35,43 +82,16 @@
def test_urlfield_5(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')
-@@ -625,18 +604,6 @@
+@@ -625,12 +604,6 @@ class FieldsTests(TestCase):
except ValidationError, e:
self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
- def test_urlfield_10(self):
-- # UTF-8 char in path, enclosed by a monkey-patch to make sure
-- # the encoding is passed to urllib2.urlopen
+- # UTF-8 in the domain.
- f = URLField(verify_exists=True)
-- try:
-- _orig_urlopen = urllib2.urlopen
-- urllib2.urlopen = lambda req: True
-- url = u'http://t\xfcr.djangoproject.com/'
-- self.assertEqual(url, f.clean(url))
-- finally:
-- urllib2.urlopen = _orig_urlopen
+- url = u'http://\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac.idn.icann.org/\u0391\u03c1\u03c7\u03b9\u03ba\u03ae_\u03c3\u03b5\u03bb\u03af\u03b4\u03b1'
+- self.assertEqual(url, f.clean(url)) #This will fail without internet.
-
# BooleanField ################################################################
def test_booleanfield_1(self):
-
---- a/tests/regressiontests/forms/tests/error_messages.py
-+++ b/tests/regressiontests/forms/tests/error_messages.py
-@@ -139,17 +139,6 @@
- self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
- self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
-
-- def test_urlfield(self):
-- e = {
-- 'required': 'REQUIRED',
-- 'invalid': 'INVALID',
-- 'invalid_link': 'INVALID LINK',
-- }
-- f = URLField(verify_exists=True, error_messages=e)
-- self.assertFormErrors([u'REQUIRED'], f.clean, '')
-- self.assertFormErrors([u'INVALID'], f.clean, 'abc.c')
-- self.assertFormErrors([u'INVALID LINK'], f.clean, 'http://www.broken.djangoproject.com')
--
- def test_booleanfield(self):
- e = {
- 'required': 'REQUIRED',
Modified: packages/python-django/trunk/debian/patches/03_manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/03_manpage.diff 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/patches/03_manpage.diff 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,10 +1,11 @@
-Forwarded-Upstream: not needed
-Author: Brett Parker <iDunno at sommitrealweird.co.uk>
-Comment:
+Description: Update manual page to refer to django-admin instead of django-admin.py
Update the manual page to speak of django-admin instead of
django-admin.py as that's the name used by the Debian package.
.
This is a Debian specific patch.
+Forwarded: not-needed
+Author: Brett Parker <iDunno at sommitrealweird.co.uk>
+Origin: vendor
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
Modified: packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff
===================================================================
--- packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/patches/04_hyphen-manpage.diff 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,12 +1,13 @@
-Forwarded-Upstream: not yet
-Author: Raphael Hertzog <hertzog at debian.org>
-Comment:
+Description: Properly escape a dash in the django-admin manual page
Fix a lintian I: message about improper usage of minus instead
of hyphen.
+ .
+ This should be forwarded upstream.
+Author: Raphael Hertzog <hertzog at debian.org>
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
-@@ -183,7 +183,7 @@ The domain of the message files (default
+@@ -192,7 +192,7 @@ The domain of the message files (default
.TP
.I \-e, \-\-extension=EXTENSION
The file extension(s) to examine (default: ".html", separate multiple
Deleted: packages/python-django/trunk/debian/patches/07_disable_url_verify_model_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/07_disable_url_verify_model_tests.diff 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/patches/07_disable_url_verify_model_tests.diff 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,38 +0,0 @@
-Forwarded-Upstream: not needed
-Author: Evgeni Golov <evgeni at debian.org>
-Comment:
- Disable model tests that require an internet connection.
- .
- This is a Debian specific patch.
-
-Index: python-django-1.2.3/tests/modeltests/validation/tests.py
-===================================================================
---- python-django-1.2.3.orig/tests/modeltests/validation/tests.py 2010-10-23 14:59:12.447389830 +0200
-+++ python-django-1.2.3/tests/modeltests/validation/tests.py 2010-10-23 15:01:01.875390381 +0200
-@@ -53,26 +53,6 @@
- mtv = ModelToValidate(number=10, name='Some Name', url='not a url')
- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'Enter a valid value.'])
-
-- 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_correct_https_url_but_nonexisting(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url='https://www.djangoproject.com/')
-- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'This URL appears to be a broken link.'])
--
-- def test_correct_ftp_url_but_nonexisting(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url='ftp://ftp.google.com/we-love-microsoft.html')
-- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'This URL appears to be a broken link.'])
--
-- def test_correct_ftps_url_but_nonexisting(self):
-- mtv = ModelToValidate(number=10, name='Some Name', url='ftps://ftp.google.com/we-love-microsoft.html')
-- self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', [u'This URL appears to be a broken link.'])
--
- def test_text_greater_that_charfields_max_length_raises_erros(self):
- mtv = ModelToValidate(number=10, name='Some Name'*100)
- self.assertFailsValidation(mtv.full_clean, ['name',])
Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series 2011-09-14 15:36:25 UTC (rev 18526)
+++ packages/python-django/trunk/debian/patches/series 2011-09-15 08:29:26 UTC (rev 18527)
@@ -1,4 +1,3 @@
01_disable_url_verify_regression_tests.diff
03_manpage.diff
04_hyphen-manpage.diff
-07_disable_url_verify_model_tests.diff
More information about the Python-modules-commits
mailing list