| 1 |
floppym 11/12/21 07:06:46 |
| 2 |
|
| 3 |
Added: django-1.3.1-djangodocs_extension.patch |
| 4 |
Log: |
| 5 |
Incorporate patch from Progress overlay by Arfrever. Should resolve bug 394777. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/django/files/django-1.3.1-djangodocs_extension.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.3.1-djangodocs_extension.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/files/django-1.3.1-djangodocs_extension.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: django-1.3.1-djangodocs_extension.patch |
| 16 |
=================================================================== |
| 17 |
https://code.djangoproject.com/changeset/16223 |
| 18 |
https://code.djangoproject.com/changeset/16231 |
| 19 |
https://code.djangoproject.com/changeset/16952 |
| 20 |
|
| 21 |
--- docs/_ext/djangodocs.py |
| 22 |
+++ docs/_ext/djangodocs.py |
| 23 |
@@ -16,7 +16,7 @@ |
| 24 |
except ImportError: |
| 25 |
json = None |
| 26 |
|
| 27 |
-from sphinx import addnodes, roles |
| 28 |
+from sphinx import addnodes, roles, __version__ as sphinx_ver |
| 29 |
from sphinx.builders.html import StandaloneHTMLBuilder |
| 30 |
from sphinx.writers.html import SmartyPantsHTMLTranslator |
| 31 |
from sphinx.util.console import bold |
| 32 |
@@ -127,26 +127,29 @@ |
| 33 |
|
| 34 |
# Don't use border=1, which docutils does by default. |
| 35 |
def visit_table(self, node): |
| 36 |
+ self._table_row_index = 0 # Needed by Sphinx |
| 37 |
self.body.append(self.starttag(node, 'table', CLASS='docutils')) |
| 38 |
|
| 39 |
# <big>? Really? |
| 40 |
def visit_desc_parameterlist(self, node): |
| 41 |
self.body.append('(') |
| 42 |
self.first_param = 1 |
| 43 |
+ self.param_separator = node.child_text_separator |
| 44 |
|
| 45 |
def depart_desc_parameterlist(self, node): |
| 46 |
self.body.append(')') |
| 47 |
|
| 48 |
- # |
| 49 |
- # Don't apply smartypants to literal blocks |
| 50 |
- # |
| 51 |
- def visit_literal_block(self, node): |
| 52 |
- self.no_smarty += 1 |
| 53 |
- SmartyPantsHTMLTranslator.visit_literal_block(self, node) |
| 54 |
- |
| 55 |
- def depart_literal_block(self, node): |
| 56 |
- SmartyPantsHTMLTranslator.depart_literal_block(self, node) |
| 57 |
- self.no_smarty -= 1 |
| 58 |
+ if sphinx_ver < '1.0.8': |
| 59 |
+ # |
| 60 |
+ # Don't apply smartypants to literal blocks |
| 61 |
+ # |
| 62 |
+ def visit_literal_block(self, node): |
| 63 |
+ self.no_smarty += 1 |
| 64 |
+ SmartyPantsHTMLTranslator.visit_literal_block(self, node) |
| 65 |
+ |
| 66 |
+ def depart_literal_block(self, node): |
| 67 |
+ SmartyPantsHTMLTranslator.depart_literal_block(self, node) |
| 68 |
+ self.no_smarty -= 1 |
| 69 |
|
| 70 |
# |
| 71 |
# Turn the "new in version" stuff (versionadded/versionchanged) into a |
Archives