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

[jwilk at users.alioth.debian.org]

    Date: Monday, August 22, 2011 @ 15:01:50
  Author: jwilk
Revision: 18236

Yet another patch from upstream to fix test suite failures with Python 3.

Added:
  packages/python-docutils/trunk/debian/patches/test-functional.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series
  packages/python-docutils/trunk/debian/patches/test-error-reporting.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-08-22 02:26:28 UTC (rev 18235)
+++ packages/python-docutils/trunk/debian/changelog	2011-08-22 15:01:50 UTC (rev 18236)
@@ -18,7 +18,8 @@
     + Add xml-core to Build-Depends-Indep.
   * Emacs major mode: use ‘sensible-browser’ to preview S5 slides
     (emacs-sensible-browser.diff).
-  * Fix NameError exceptions in the test suite (test_error_reporting.diff).
+  * Fix exceptions in the test suite (test_error_reporting.diff,
+    test-functioncal.diff).
   * Drop 12_more_usrbinenv.diff; the patched file wasn't being used anyway.
 
  -- Jakub Wilk <jwilk at debian.org>  Mon, 22 Aug 2011 03:13:40 +0200

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2011-08-22 02:26:28 UTC (rev 18235)
+++ packages/python-docutils/trunk/debian/patches/series	2011-08-22 15:01:50 UTC (rev 18236)
@@ -4,4 +4,5 @@
 15_emacs_debian_paths.diff
 emacs-sensible-browser.diff
 test-error-reporting.diff
+test-functional.diff
 move-data-to-usr-share.diff

Modified: packages/python-docutils/trunk/debian/patches/test-error-reporting.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test-error-reporting.diff	2011-08-22 02:26:28 UTC (rev 18235)
+++ packages/python-docutils/trunk/debian/patches/test-error-reporting.diff	2011-08-22 15:01:50 UTC (rev 18236)
@@ -1,7 +1,6 @@
 Description: Fix NameError exceptions in test_error_reporting.
-Author: Jakub Wilk <jwilk at debian.org>
+Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/test/test_functional.py?r1=7039&r2=7097
 Bug: http://sourceforge.net/tracker/?func=detail&aid=3395887&group_id=38414&atid=422030
-Forwarded: no
 Last-Update: 2011-08-22
 
 --- a/test/test_error_reporting.py

Added: packages/python-docutils/trunk/debian/patches/test-functional.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test-functional.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/test-functional.diff	2011-08-22 15:01:50 UTC (rev 18236)
@@ -0,0 +1,15 @@
+Description: Fix UnicodeDecodeError exceptions in test_functional.
+Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/test/test_functional.py?r1=7039&r2=7097
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3395887&group_id=38414&atid=422030
+Last-Update: 2011-08-22
+
+--- a/test/test_functional.py
++++ b/test/test_functional.py
+@@ -175,7 +175,6 @@
+             f = open(expected_path, 'r')
+         else: # samples are UTF8 encoded. 'rb' leads to errors with Python 3!
+             f = open(expected_path, 'r', encoding='utf-8')
+-        f = open(expected_path, 'r')
+         # Normalize line endings:
+         expected = '\n'.join(f.read().splitlines())
+         f.close()