[Python-modules-commits] r22890 - in packages/sphinx/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, November 4, 2012 @ 19:40:42
  Author: jwilk
Revision: 22890

Backport upstream patch to fix encoding issues in test_build_html. Now that this is fixed, stop running Python 3 tests under LC_ALL=C.

Added:
  packages/sphinx/trunk/debian/patches/test_build_html_rb.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2012-11-04 17:01:37 UTC (rev 22889)
+++ packages/sphinx/trunk/debian/changelog	2012-11-04 19:40:42 UTC (rev 22890)
@@ -7,12 +7,14 @@
   * Add dvipng to Suggests (closes: #687273). Thanks to Matthias Klose for the
     bug report.
   * Set PYTHONHASHSEED=random in debian/rules and in DEP-8 tests.
+  * Backport upstream patch to fix encoding issues in test_build_html. Now
+    that this is fixed, stop running Python 3 tests under LC_ALL=C.
 
   [ Dmitry Shachnev ]
   * Update Homepage field to point to http://sphinx-doc.org/.
   * Build-depend of python3-all instead of python3.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 04 Nov 2012 18:00:29 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 04 Nov 2012 20:38:14 +0100
 
 sphinx (1.1.3+dfsg-4) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2012-11-04 17:01:37 UTC (rev 22889)
+++ packages/sphinx/trunk/debian/patches/series	2012-11-04 19:40:42 UTC (rev 22890)
@@ -8,3 +8,4 @@
 fix_nepali_po.diff
 pygments_byte_strings.diff
 fix_shorthandoff.diff
+test_build_html_rb.diff

Added: packages/sphinx/trunk/debian/patches/test_build_html_rb.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/test_build_html_rb.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/test_build_html_rb.diff	2012-11-04 19:40:42 UTC (rev 22890)
@@ -0,0 +1,17 @@
+Description: fix encoding issues in test_build_html
+ test_build_html: open files that are fed to ElementTree parser in "rb"
+ mode, fixing encoding issues.
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/changeset/15c9d212bbf4
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/895
+
+--- a/tests/test_build_html.py
++++ b/tests/test_build_html.py
+@@ -328,7 +328,7 @@
+     for fname, paths in HTML_XPATH.iteritems():
+         parser = NslessParser()
+         parser.entity.update(htmlentitydefs.entitydefs)
+-        fp = open(os.path.join(app.outdir, fname))
++        fp = open(os.path.join(app.outdir, fname), 'rb')
+         try:
+             etree = ET.parse(fp, parser)
+         finally:

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2012-11-04 17:01:37 UTC (rev 22889)
+++ packages/sphinx/trunk/debian/rules	2012-11-04 19:40:42 UTC (rev 22890)
@@ -39,7 +39,7 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	find sphinx/locale/ -name '*.po' | xargs -t -I {} msgfmt -o /dev/null -c {}
 	$(python_all) tests/run.py --verbose --no-skip
-	export LC_ALL=C.UTF-8 && $(python3_all) tests/run.py --verbose
+	$(python3_all) tests/run.py --verbose
 	cd build/py3/ && rm -rf tests/ sphinx/pycode/Grammar.pickle
 	xvfb-run ./debian/jstest/run-tests
 endif