[Python-modules-commits] r17529 - in packages/sphinx/trunk/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 12:43:01
  Author: jwilk
Revision: 17529

More verbose patch description for docstring_parse.diff.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/docstring_parse.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-06-19 12:30:46 UTC (rev 17528)
+++ packages/sphinx/trunk/debian/changelog	2011-06-19 12:43:01 UTC (rev 17529)
@@ -12,9 +12,9 @@
   [ Nikolaus Rath ]
   * Backport upstream changesets a8b0ef275438 and de340a6098c7 to allow
     extraction of function signature from docstring for extension modules.
-    Closes: 630409.
+    (closes: #630409). The feature is disabled by default for the moment.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Jun 2011 13:17:57 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Jun 2011 14:34:29 +0200
 
 sphinx (1.0.7-4) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/patches/docstring_parse.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/docstring_parse.diff	2011-06-19 12:30:46 UTC (rev 17528)
+++ packages/sphinx/trunk/debian/patches/docstring_parse.diff	2011-06-19 12:43:01 UTC (rev 17529)
@@ -1,8 +1,12 @@
-Description: Backport upstream commit de340a6098c7 and a8b0ef275438
+Description: Allow extraction of function signature from docstring for extension modules.
+ Backport upstream changesets a8b0ef275438 and de340a6098c7 to allow extraction
+ of function signature from docstring for extension modules.
+ .
+ Please note that the feature is disabled by default for the time being.
 Bug-Debian: http://bugs.debian.org/630409
 Bug: https://bitbucket.org/birkenfeld/sphinx/issue/564
 Forwarded: not-needed
-diff --git a/doc/ext/autodoc.rst b/doc/ext/autodoc.rst
+
 --- a/doc/ext/autodoc.rst
 +++ b/doc/ext/autodoc.rst
 @@ -260,6 +260,22 @@
@@ -28,7 +32,6 @@
  
  Docstring preprocessing
  -----------------------
-diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
 --- a/sphinx/ext/autodoc.py
 +++ b/sphinx/ext/autodoc.py
 @@ -426,13 +426,13 @@
@@ -137,7 +140,6 @@
      app.add_event('autodoc-process-docstring')
      app.add_event('autodoc-process-signature')
      app.add_event('autodoc-skip-member')
-diff --git a/sphinx/util/docstrings.py b/sphinx/util/docstrings.py
 --- a/sphinx/util/docstrings.py
 +++ b/sphinx/util/docstrings.py
 @@ -12,7 +12,7 @@
@@ -175,7 +177,6 @@
      # Remove any leading blank lines.
      while lines and not lines[0]:
          lines.pop(0)
-diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
 --- a/tests/test_autodoc.py
 +++ b/tests/test_autodoc.py
 @@ -501,6 +501,14 @@