diff options
Diffstat (limited to 'dev-python/django/files/django-1.2.4-python-2.7.patch')
| -rw-r--r-- | dev-python/django/files/django-1.2.4-python-2.7.patch | 29 |
1 files changed, 0 insertions, 29 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]))) |