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

[jwilk at users.alioth.debian.org]

    Date: Thursday, May 10, 2012 @ 19:59:40
  Author: jwilk
Revision: 21689

Drop fix-docutilsxmltestcase-debian.diff.

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2012-05-10 19:57:36 UTC (rev 21688)
+++ packages/python-docutils/trunk/debian/changelog	2012-05-10 19:59:40 UTC (rev 21689)
@@ -11,11 +11,14 @@
     + Drop fix-io-encoding-issues.diff: applied upstream.
     + Drop fix-docutilsxmltestcase.diff: applied upstream.
     + Refresh other patches.
+  * Drop fix-docutilsxmltestcase-debian.diff; it was only needed to
+    work around a bug in Debian Python interpreter packages, which has been
+    fixed.
   * Update move-data-to-usr-share.diff to cover the test/ directory, too.
   * Add DEP-8 tests.
   * Fix (Python 2 version of) rst-buildhtml shebang to #!/usr/bin/python.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 10 May 2012 21:56:00 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 10 May 2012 21:58:18 +0200
 
 python-docutils (0.8.1-6) unstable; urgency=low
 

Deleted: packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff	2012-05-10 19:57:36 UTC (rev 21688)
+++ packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff	2012-05-10 19:59:40 UTC (rev 21689)
@@ -1,28 +0,0 @@
-Description: Forge sys.version_info for DocutilsXMLTestCase.
- Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3 when
- it's in fact 2.7.2/3.2.2 with patched xml.dom.minidom.Document.toprettyxml()
- method.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug-Debian: http://bugs.debian.org/645369
-Forwarded: not-needed
-Last-Update: 2012-03-03
-
---- a/test/test_writers/test_docutils_xml.py
-+++ b/test/test_writers/test_docutils_xml.py
-@@ -119,6 +119,16 @@
- </document>
- """
- 
-+import sys
-+if sys.version_info[:3] in [(2, 7, 2), (3, 2, 2)]:
-+    import xml.dom.minidom as minidom
-+    if minidom.parseString('<x><y>z</y></x>').toprettyxml() == '<?xml version="1.0" ?>\n<x>\n\t<y>z</y>\n</x>\n':
-+        sys_version_info = sys.version_info[:2] + (3, 'candidate', 0)
-+        class sys:
-+            version_info = sys_version_info
-+        del sys_version_info
-+    del minidom
-+del sys
- 
- def publish_xml(settings, source):
-     return docutils.core.publish_string(source=source.encode('utf8'),

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2012-05-10 19:57:36 UTC (rev 21688)
+++ packages/python-docutils/trunk/debian/patches/series	2012-05-10 19:59:40 UTC (rev 21689)
@@ -2,7 +2,6 @@
 10_doc_debian_paths.diff
 emacs-sensible-browser.diff
 testall-no-stdout-stderr-redirect.diff
-fix-docutilsxmltestcase-debian.diff
 no-test-skipping.diff
 move-data-to-usr-share.diff
 # dep8.diff