diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-10 20:15:02 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-10 20:15:02 +0000 |
commit | df03d701005b03f60d755c37ec3f249d1edd53f8 (patch) | |
tree | e1c1d6a506f2165886201800c1e451adeaf52054 /dev-python/django/files | |
parent | Remove barry from the libopensync mask. The support for it has been dropped. (diff) | |
download | historical-df03d701005b03f60d755c37ec3f249d1edd53f8.tar.gz historical-df03d701005b03f60d755c37ec3f249d1edd53f8.tar.bz2 historical-df03d701005b03f60d755c37ec3f249d1edd53f8.zip |
Delete older ebuild.
Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
Diffstat (limited to 'dev-python/django/files')
-rw-r--r-- | dev-python/django/files/django-1.2.4-python-2.7.patch | 29 | ||||
-rw-r--r-- | dev-python/django/files/django-1.2.4-ticket-14576.patch | 64 |
2 files changed, 0 insertions, 93 deletions
diff --git a/dev-python/django/files/django-1.2.4-python-2.7.patch b/dev-python/django/files/django-1.2.4-python-2.7.patch deleted file mode 100644 index 53923844f7e3..000000000000 --- a/dev-python/django/files/django-1.2.4-python-2.7.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://code.djangoproject.com/ticket/14947 -http://code.djangoproject.com/changeset/15165 - ---- tests/regressiontests/fixtures_regress/tests.py -+++ tests/regressiontests/fixtures_regress/tests.py -@@ -1,6 +1,7 @@ - # -*- coding: utf-8 -*- - # Unittests for fixtures. - import os -+import re - import sys - try: - from cStringIO import StringIO -@@ -327,9 +328,14 @@ - - # Output order isn't guaranteed, so check for parts - data = stdout.getvalue() -+ -+ # Get rid of artifacts like '000000002' to eliminate the differences -+ # between different Python versions. -+ data = re.sub('0{6,}\d', '', data) -+ - lion_json = '{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}' - emu_json = '{"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}' -- platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2000000000000002, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}' -+ platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}' - platypus_json = platypus_json % animal.pk - - self.assertEqual(len(data), len('[%s]' % ', '.join([lion_json, emu_json, platypus_json]))) diff --git a/dev-python/django/files/django-1.2.4-ticket-14576.patch b/dev-python/django/files/django-1.2.4-ticket-14576.patch deleted file mode 100644 index 8308e5405fe2..000000000000 --- a/dev-python/django/files/django-1.2.4-ticket-14576.patch +++ /dev/null @@ -1,64 +0,0 @@ -http://code.djangoproject.com/ticket/14576 -http://code.djangoproject.com/changeset/15044 - ---- django/contrib/formtools/tests.py -+++ django/contrib/formtools/tests.py -@@ -116,7 +116,7 @@ - hash1 = utils.security_hash(None, f1) - hash2 = utils.security_hash(None, f2) - self.assertEqual(hash1, hash2) -- -+ - def test_empty_permitted(self): - """ - Regression test for #10643: the security hash should allow forms with -@@ -214,3 +214,26 @@ - wizard(DummyRequest(POST=data)) - self.assertTrue(reached[0]) - -+ def test_14576(self): -+ """ -+ Regression test for ticket #14576. -+ -+ The form of the last step is not passed to the done method. -+ """ -+ reached = [False] -+ that = self -+ -+ class Wizard(WizardClass): -+ def done(self, request, form_list): -+ reached[0] = True -+ that.assertTrue(len(form_list) == 2) -+ -+ wizard = Wizard([WizardPageOneForm, -+ WizardPageTwoForm]) -+ -+ data = {"0-field": "test", -+ "1-field": "test2", -+ "hash_0": "2fdbefd4c0cad51509478fbacddf8b13", -+ "wizard_step": "1"} -+ wizard(DummyRequest(POST=data)) -+ self.assertTrue(reached[0]) ---- django/contrib/formtools/wizard.py -+++ django/contrib/formtools/wizard.py -@@ -94,9 +94,9 @@ - # Since the hashes only take into account values, and not other - # other validation the form might do, we must re-do validation - # now for security reasons. -- current_form_list = [self.get_form(i, request.POST) for i in range(current_step)] -+ previous_form_list = [self.get_form(i, request.POST) for i in range(current_step)] - -- for i, f in enumerate(current_form_list): -+ for i, f in enumerate(previous_form_list): - if request.POST.get("hash_%d" % i, '') != self.security_hash(request, f): - return self.render_hash_failure(request, i) - -@@ -111,7 +111,7 @@ - - - if next_step == self.num_steps(): -- return self.done(request, current_form_list) -+ return self.done(request, previous_form_list + [form]) - else: - form = self.get_form(next_step) - self.step = current_step = next_step |