Merge lp:~barry/ubuntu/quantal/genshi/lp935516 into lp:ubuntu/quantal/genshi

[Barry Warsaw]

I'm not entirely sure I like this patch, although it does fix the FTBFS. The problem I have is that I'm not sure what the semantics of HTMLSanitizer() should be on the bogus SCRIPT tags. Should genshi strip the whole thing? I think upstream will have to decide, and if you follow the links to the upstream tracker issue, there has yet to be any comments.

So without upstream's guidance, perhaps we should just fix the FTBFS now, and watch upstream to apply any patch there once it's available. If nothing's forthcoming until a new version is released, we can resync through Debian for 13.04.

Thoughts?

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-23 11:58:39 +0000
+++ debian/changelog	2012-10-02 21:22:20 +0000
@@ -1,3 +1,15 @@
+genshi (0.6-2ubuntu1) quantal; urgency=low
+
+  * genshi/filters/tests/html.py: Adjust some tests which used to fail
+    before changes in upstream Python 2.7.3.  These now succeed.  While
+    this change is appropriate for the FTBFS in Ubuntu 12.04 which has
+    Python 2.7.3, they may not be appropriate as a general fix, so keep an
+    eye on the upstream bug reports.  (LP: #935516)
+  * debian/rules: As suggested in the linked Debian bug, use `set -e` on
+    the test invocation line to force the build to fail when tests fail.
+
+ -- Barry Warsaw <[e-mail]>  Tue, 02 Oct 2012 16:48:23 -0400
+
 genshi (0.6-2) unstable; urgency=low
 
   * Switch to dh_python2. Thanks to Julian Taylor. Closes: #637383.
 
=== modified file 'debian/control'
--- debian/control	2011-08-23 11:58:39 +0000
+++ debian/control	2012-10-02 21:22:20 +0000
@@ -1,7 +1,8 @@
 Source: genshi
 Section: python
 Priority: optional
-Maintainer: Arnaud Fontaine <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Arnaud Fontaine <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
 Build-Depends: debhelper (>= 5.0.37.2),
                cdbs (>= 0.4.90~),
 
=== added directory 'debian/patches'
=== added file 'debian/patches/lp935516.patch'
--- debian/patches/lp935516.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp935516.patch	2012-10-02 21:22:20 +0000
@@ -0,0 +1,40 @@
+Description: Two tests which used to fail in earlier Pythons, now succeed in
+ Python 2.7.3.  Adjust the tests to check for success in order to fix a FTBFS
+ in Ubuntu 12.10.
+Author: Barry Warsaw <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/genshi/+bug/935516
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661441
+Bug: http://genshi.edgewall.org/ticket/500
+Bug: http://genshi.edgewall.org/ticket/501
+
+--- a/genshi/filters/tests/html.py
++++ b/genshi/filters/tests/html.py
+@@ -365,9 +365,12 @@
+         self.assertEquals('', (html | HTMLSanitizer()).render())
+         html = HTML('<SCRIPT SRC="http://example.com/"></SCRIPT>')
+         self.assertEquals('', (html | HTMLSanitizer()).render())
+-        self.assertRaises(ParseError, HTML, '<SCR\0IPT>alert("foo")</SCR\0IPT>')
+-        self.assertRaises(ParseError, HTML,
+-                          '<SCRIPT&XYZ SRC="http://example.com/"></SCRIPT>')
++        html = HTML('<SCR\0IPT>alert("foo")</SCR\0IPT>')
++        self.assertEquals('&lt;SCR\x00IPT&gt;alert("foo")',
++                          (html | HTMLSanitizer()).render())
++        html = HTML('<SCRIPT&XYZ SRC="http://example.com/"></SCRIPT>')
++        self.assertEquals('&lt;SCRIPT&amp;XYZ; SRC="http://example.com/"&gt;',
++                          (html | HTMLSanitizer()).render())
+ 
+     def test_sanitize_remove_onclick_attr(self):
+         html = HTML('<div onclick=\'alert("foo")\' />')
+@@ -437,9 +440,9 @@
+         # Case-insensitive protocol matching
+         html = HTML('<IMG SRC=\'JaVaScRiPt:alert("foo")\'>')
+         self.assertEquals('<img/>', (html | HTMLSanitizer()).render())
+-        # Grave accents (not parsed)
+-        self.assertRaises(ParseError, HTML,
+-                          '<IMG SRC=`javascript:alert("RSnake says, \'foo\'")`>')
++        # Grave accents.
++        html = HTML('<IMG SRC=`javascript:alert("RSnake says, \'foo\'")`>')
++        self.assertEquals('<img/>', (html | HTMLSanitizer()).render())
+         # Protocol encoded using UTF-8 numeric entities
+         html = HTML('<IMG SRC=\'&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;'
+                     '&#112;&#116;&#58;alert("foo")\'>')
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-10-02 21:22:20 +0000
@@ -0,0 +1,1 @@
+lp935516.patch
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-23 11:58:39 +0000
+++ debian/rules	2012-10-02 21:22:20 +0000
@@ -16,7 +16,7 @@
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 binary-install/python-genshi::
-	for py in $(shell pyversions -vr); do \
+	set -e; for py in $(shell pyversions -vr); do \
 		PYTHONPATH=$(cdbs_python_destdir)/usr/lib/python$$py/site-packages \
 			python$$py setup.py test; \
 	done;