[Python-modules-commits] r19488 - in packages/python-docutils/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, December 1, 2011 @ 22:21:30
  Author: jwilk
Revision: 19488

Backport upstream patch to follow the changes in the xml.dom.minidom.Document.toprettyxml method.

Added:
  packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-12-01 06:35:36 UTC (rev 19487)
+++ packages/python-docutils/trunk/debian/changelog	2011-12-01 22:21:30 UTC (rev 19488)
@@ -1,9 +1,15 @@
 python-docutils (0.8.1-5) UNRELEASED; urgency=low
 
+  [ Simon McVittie ]
   * Remove myself from Uploaders
 
- -- Simon McVittie <smcv at debian.org>  Thu, 17 Nov 2011 10:41:41 +0000
+  [ Jakub Wilk ]
+  * Backport upstream patch to follow the changes in
+    the xml.dom.minidom.Document.toprettyxml method
+    (fix-docutilsxmltestcase.diff).
 
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 01 Dec 2011 22:48:25 +0100
+
 python-docutils (0.8.1-4) unstable; urgency=low
 
   * When running the test suite, don't copy stdout and stderr output to a log

Added: packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff	2011-12-01 22:21:30 UTC (rev 19488)
@@ -0,0 +1,62 @@
+Description: Follow the changes in xml.dom.minidom.Document.toprettyxml().
+ xml.dom.minidom.Document.toprettyxml() has change behaviour in Python 2.7.3
+ and 3.3.3. See http://bugs.python.org/issue4147 for details.
+ .
+ This patch updates DocutilsXMLTestCase to cope with these changes.
+Origin: backport, http://svn.berlios.de/viewvc/docutils/trunk/docutils/test/test_writers/test_docutils_xml.py?r1=7221&r2=7226
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3423983&group_id=38414&atid=422030
+Bug-Debian: http://bugs.debian.org/645369
+Last-Update: 2011-12-01
+
+--- a/test/test_writers/test_docutils_xml.py
++++ b/test/test_writers/test_docutils_xml.py
+@@ -10,6 +10,7 @@
+ 
+ from __init__ import DocutilsTestSupport
+ 
++import sys
+ import docutils
+ import docutils.core
+ from docutils._compat import b
+@@ -29,6 +30,13 @@
+     bodynormal = b('<document source="<string>"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc€</paragraph></document>')
+     bodynewlines = b("""\
+ <document source="<string>">
++<paragraph>Test</paragraph>
++<transition/>
++<paragraph>Test. \xe4\xf6\xfc€</paragraph>
++</document>
++""")
++    bodynewlines_old = b("""\
++<document source="<string>">
+ <paragraph>
+ Test
+ </paragraph>
+@@ -40,6 +48,13 @@
+ """)
+     bodyindents = b("""\
+ <document source="<string>">
++    <paragraph>Test</paragraph>
++    <transition/>
++    <paragraph>Test. \xe4\xf6\xfc€</paragraph>
++</document>
++""")
++    bodyindents_old = b("""\
++<document source="<string>">
+     <paragraph>
+         Test
+     </paragraph>
+@@ -79,6 +94,13 @@
+                                           settings_overrides=settings),
+                                          expected)
+ 
++    # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18
++    # to fix http://bugs.python.org/issue4147
++    if (sys.version_info < (2, 7, 3) or
++        sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)):
++        bodynewlines = bodynewlines_old
++        bodyindents = bodyindents_old
++
+ 
+ if __name__ == '__main__':
+     import unittest

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2011-12-01 06:35:36 UTC (rev 19487)
+++ packages/python-docutils/trunk/debian/patches/series	2011-12-01 22:21:30 UTC (rev 19488)
@@ -9,4 +9,5 @@
 add-missing-import.diff
 fix-error-reporting-encoding-issues.diff
 fix-io-encoding-issues.diff
+fix-docutilsxmltestcase.diff
 move-data-to-usr-share.diff