[Python-modules-commits] r9118 - in packages/python-django/branches/experimental/debian (3 files)
lamby at users.alioth.debian.org
lamby at users.alioth.debian.org
Wed Jul 22 08:48:18 UTC 2009
Date: Wednesday, July 22, 2009 @ 08:48:15
Author: lamby
Revision: 9118
Drop "05_10539-sphinx06-compatibility.diff"; it has been applied upstream.
Modified:
packages/python-django/branches/experimental/debian/changelog
packages/python-django/branches/experimental/debian/patches/series
Deleted:
packages/python-django/branches/experimental/debian/patches/05_10539-sphinx06-compatibility.diff
Modified: packages/python-django/branches/experimental/debian/changelog
===================================================================
--- packages/python-django/branches/experimental/debian/changelog 2009-07-22 08:48:09 UTC (rev 9117)
+++ packages/python-django/branches/experimental/debian/changelog 2009-07-22 08:48:15 UTC (rev 9118)
@@ -1,6 +1,7 @@
python-django (1.1~rc1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop "05_10539-sphinx06-compatibility.diff"; it has been applied upstream.
-- Chris Lamb <lamby at debian.org> Wed, 22 Jul 2009 09:25:56 +0100
Deleted: packages/python-django/branches/experimental/debian/patches/05_10539-sphinx06-compatibility.diff
===================================================================
--- packages/python-django/branches/experimental/debian/patches/05_10539-sphinx06-compatibility.diff 2009-07-22 08:48:09 UTC (rev 9117)
+++ packages/python-django/branches/experimental/debian/patches/05_10539-sphinx06-compatibility.diff 2009-07-22 08:48:15 UTC (rev 9118)
@@ -1,133 +0,0 @@
-Forwarded-Upstream: not needed
-Comment:
- Patch taken verbatim from <http://code.djangoproject.com/ticket/10539>
- to fix compatibility with python-sphinx >= 0.6. This patch should retain
- compatibility with 0.4 too.
-
-diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
---- a/docs/_ext/djangodocs.py
-+++ b/docs/_ext/djangodocs.py
-@@ -6,10 +6,16 @@
- import docutils.transforms
- import sphinx
- import sphinx.addnodes
--import sphinx.builder
-+try:
-+ from sphinx import builders
-+except ImportError:
-+ import sphinx.builder as builders
- import sphinx.directives
- import sphinx.environment
--import sphinx.htmlwriter
-+try:
-+ import sphinx.writers.html as sphinx_htmlwriter
-+except ImportError:
-+ import sphinx.htmlwriter as sphinx_htmlwriter
- import sphinx.roles
- from docutils import nodes
-
-@@ -44,7 +50,7 @@
- directivename = "django-admin-option",
- rolename = "djadminopt",
- indextemplate = "pair: %s; django-admin command-line option",
-- parse_node = lambda env, sig, signode: sphinx.directives.parse_option_desc(signode, sig),
-+ parse_node = parse_django_adminopt_node,
- )
- app.add_config_value('django_next_version', '0.0', True)
- app.add_directive('versionadded', parse_version_directive, 1, (1, 1, 1))
-@@ -102,7 +108,7 @@
- if len(node.children) == 1 and isinstance(node.children[0], self.suppress_blockquote_child_nodes):
- node.replace_self(node.children[0])
-
--class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
-+class DjangoHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
- """
- Django-specific reST to HTML tweaks.
- """
-@@ -125,10 +131,10 @@
- #
- def visit_literal_block(self, node):
- self.no_smarty += 1
-- sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
--
-+ sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
-+
- def depart_literal_block(self, node):
-- sphinx.htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node)
-+ sphinx_htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node)
- self.no_smarty -= 1
-
- #
-@@ -162,7 +168,7 @@
- # Give each section a unique ID -- nice for custom CSS hooks
- # This is different on docutils 0.5 vs. 0.4...
-
-- if hasattr(sphinx.htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title') and sphinx.__version__ == '0.4.2':
-+ if hasattr(sphinx_htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title') and sphinx.__version__ == '0.4.2':
- def start_tag_with_title(self, node, tagname, **atts):
- node = {
- 'classes': node.get('classes', []),
-@@ -176,7 +182,7 @@
- node['ids'] = ['s-' + i for i in old_ids]
- if sphinx.__version__ != '0.4.2':
- node['ids'].extend(old_ids)
-- sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
-+ sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
- node['ids'] = old_ids
-
- def parse_django_admin_node(env, sig, signode):
-@@ -186,6 +192,25 @@
- signode += sphinx.addnodes.desc_name(title, title)
- return sig
-
-+def parse_django_adminopt_node(env, sig, signode):
-+ """A copy of sphinx.directives.CmdoptionDesc.parse_signature()"""
-+ from sphinx import addnodes
-+ from sphinx.directives.desc import option_desc_re
-+ count = 0
-+ firstname = ''
-+ for m in option_desc_re.finditer(sig):
-+ optname, args = m.groups()
-+ if count:
-+ signode += addnodes.desc_addname(', ', ', ')
-+ signode += addnodes.desc_name(optname, optname)
-+ signode += addnodes.desc_addname(args, args)
-+ if not count:
-+ firstname = optname
-+ count += 1
-+ if not firstname:
-+ raise ValueError
-+ return firstname
-+
- def monkeypatch_pickle_builder():
- import shutil
- from os import path
-@@ -214,12 +239,12 @@
-
- # copy the environment file from the doctree dir to the output dir
- # as needed by the web app
-- shutil.copyfile(path.join(self.doctreedir, sphinx.builder.ENV_PICKLE_FILENAME),
-- path.join(self.outdir, sphinx.builder.ENV_PICKLE_FILENAME))
-+ shutil.copyfile(path.join(self.doctreedir, builders.ENV_PICKLE_FILENAME),
-+ path.join(self.outdir, builders.ENV_PICKLE_FILENAME))
-
- # touch 'last build' file, used by the web application to determine
- # when to reload its environment and clear the cache
-- open(path.join(self.outdir, sphinx.builder.LAST_BUILD_FILENAME), 'w').close()
-+ open(path.join(self.outdir, builders.LAST_BUILD_FILENAME), 'w').close()
-
-- sphinx.builder.PickleHTMLBuilder.handle_finish = handle_finish
--
-+ builders.PickleHTMLBuilder.handle_finish = handle_finish
-+
-diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
---- a/docs/_templates/layout.html
-+++ b/docs/_templates/layout.html
-@@ -1,6 +1,6 @@
- {% extends "!layout.html" %}
-
--{%- macro secondnav %}
-+{%- macro secondnav() %}
- {%- if prev %}
- « <a href="{{ prev.link|e }}" title="{{ prev.title|e }}">previous</a>
- {{ reldelim2 }}
Modified: packages/python-django/branches/experimental/debian/patches/series
===================================================================
--- packages/python-django/branches/experimental/debian/patches/series 2009-07-22 08:48:09 UTC (rev 9117)
+++ packages/python-django/branches/experimental/debian/patches/series 2009-07-22 08:48:15 UTC (rev 9118)
@@ -1,3 +1,2 @@
03_manpage.diff
04_hyphen-manpage.diff
-05_10539-sphinx06-compatibility.diff
More information about the Python-modules-commits
mailing list