| 1 |
idella4 13/05/27 22:30:12 |
| 2 |
|
| 3 |
Added: django-1.5-py3tests.patch django-1.5-objects.patch |
| 4 |
Removed: django-1.5.1-objects.patch |
| 5 |
Log: |
| 6 |
rename 1 patch, add py3tests.patch to fix tests for py3 in both 1.5 versions |
| 7 |
|
| 8 |
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-python/django/files/django-1.5-py3tests.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.5-py3tests.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.5-py3tests.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: django-1.5-py3tests.patch |
| 17 |
=================================================================== |
| 18 |
https://code.djangoproject.com/ticket/20514 |
| 19 |
diff -ur Django-1.5.orig/django/contrib/gis/tests/test_measure.py Django-1.5/django/contrib/gis/tests/test_measure.py |
| 20 |
--- django/contrib/gis/tests/test_measure.py 2013-02-27 03:04:14.000000000 +0800 |
| 21 |
+++ django/contrib/gis/tests/test_measure.py 2013-05-28 04:40:18.983011224 +0800 |
| 22 |
@@ -40,7 +40,7 @@ |
| 23 |
"Testing access in different units" |
| 24 |
d = D(m=100) |
| 25 |
self.assertEqual(d.km, 0.1) |
| 26 |
- self.assertAlmostEqual(d.ft, 328.084, 3) |
| 27 |
+ self.assertAlmostEqual(d.ft, 328.084, places=3) |
| 28 |
|
| 29 |
def testAccessInvalid(self): |
| 30 |
"Testing access in invalid units" |
| 31 |
@@ -172,7 +172,7 @@ |
| 32 |
"Testing access in different units" |
| 33 |
a = A(sq_m=100) |
| 34 |
self.assertEqual(a.sq_km, 0.0001) |
| 35 |
- self.assertAlmostEqual(a.sq_ft, 1076.391, 3) |
| 36 |
+ self.assertAlmostEqual(a.sq_ft, 1076.391, places=3) |
| 37 |
|
| 38 |
def testAccessInvaliA(self): |
| 39 |
"Testing access in invalid units" |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-python/django/files/django-1.5-objects.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.5-objects.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.5-objects.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: django-1.5-objects.patch |
| 49 |
=================================================================== |
| 50 |
Remove un-needed objects.inv files from d'loading during doc build |
| 51 |
diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py |
| 52 |
--- docs/conf.py 2013-03-29 04:10:14.000000000 +0800 |
| 53 |
+++ docs/conf.py 2013-05-28 01:54:49.695008477 +0800 |
| 54 |
@@ -91,12 +91,6 @@ |
| 55 |
|
| 56 |
# Links to Python's docs should reference the most recent version of the 2.x |
| 57 |
# branch, which is located at this URL. |
| 58 |
-intersphinx_mapping = { |
| 59 |
- 'python': ('http://docs.python.org/2.7', None), |
| 60 |
- 'sphinx': ('http://sphinx.pocoo.org/', None), |
| 61 |
- 'six': ('http://packages.python.org/six/', None), |
| 62 |
- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None), |
| 63 |
-} |
| 64 |
|
| 65 |
# Python's docs don't change every week. |
| 66 |
intersphinx_cache_limit = 90 # days |
| 67 |
# Fix creation of html docs on python 3 |
| 68 |
# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e |
| 69 |
diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py |
| 70 |
--- docs/_ext/djangodocs.py 2013-03-29 04:07:21.000000000 +0800 |
| 71 |
+++ docs/_ext/djangodocs.py 2013-05-28 02:34:59.057009144 +0800 |
| 72 |
@@ -204,7 +204,7 @@ |
| 73 |
if t == "templatefilter" and l == "ref/templates/builtins"], |
| 74 |
} |
| 75 |
outfilename = os.path.join(self.outdir, "templatebuiltins.js") |
| 76 |
- with open(outfilename, 'wb') as fp: |
| 77 |
+ with open(outfilename, 'w') as fp: |
| 78 |
fp.write('var django_template_builtins = ') |
| 79 |
json.dump(templatebuiltins, fp) |
| 80 |
fp.write(';\n') |
Archives