tags 644246 + pending
thanks
Dear maintainer,
I've prepared an NMU for python-meld3 (versioned as 0.6.5-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I should
delay it longer.
Regards.
diff -Nru python-meld3-0.6.5/debian/changelog
python-meld3-0.6.5/debian/changelog
--- python-meld3-0.6.5/debian/changelog 2011-10-31 11:02:00.000000000 +0900
+++ python-meld3-0.6.5/debian/changelog 2011-10-31 10:52:37.000000000 +0900
@@ -1,3 +1,12 @@
+python-meld3 (0.6.5-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply Ubuntu patch to make the package compatible with Python
+ 2.7. Thanks to Jessica McKellar. Closes: #644246.
+ + Switch to 3.0 (quilt) source format to apply patch cleanly.
+
+ -- Arnaud Fontaine <ar...@debian.org> Mon, 31 Oct 2011 10:48:32 +0900
+
python-meld3 (0.6.5-3) unstable; urgency=low
* Bring maintainer source in sync with NMUs
diff -Nru
python-meld3-0.6.5/debian/patches/fixtag_import_error_with_python2.7.patch
python-meld3-0.6.5/debian/patches/fixtag_import_error_with_python2.7.patch
--- python-meld3-0.6.5/debian/patches/fixtag_import_error_with_python2.7.patch
1970-01-01 09:00:00.000000000 +0900
+++ python-meld3-0.6.5/debian/patches/fixtag_import_error_with_python2.7.patch
2011-10-31 10:50:06.000000000 +0900
@@ -0,0 +1,71 @@
+--- python-meld3-0.6.5.orig/meld3/meld3.py
++++ python-meld3-0.6.5/meld3/meld3.py
+@@ -3,6 +3,7 @@
+ import re
+ import types
+ import mimetools
++import string
+ from StringIO import StringIO
+
+ try:
+@@ -24,10 +25,32 @@
+ from xml.etree.ElementTree import QName
+ from xml.etree.ElementTree import _raise_serialization_error
+ from xml.etree.ElementTree import _namespace_map
+- from xml.etree.ElementTree import fixtag
+ from xml.etree.ElementTree import parse as et_parse
+ from xml.etree.ElementTree import ElementPath
+
++ try:
++ from xml.etree.ElementTree import fixtag
++ except:
++ def fixtag(tag, namespaces):
++ # given a decorated tag (of the form {uri}tag), return prefixed
++ # tag and namespace declaration, if any
++ if isinstance(tag, QName):
++ tag = tag.text
++ namespace_uri, tag = string.split(tag[1:], "}", 1)
++ prefix = namespaces.get(namespace_uri)
++ if prefix is None:
++ prefix = _namespace_map.get(namespace_uri)
++ if prefix is None:
++ prefix = "ns%d" % len(namespaces)
++ namespaces[namespace_uri] = prefix
++ if prefix == "xml":
++ xmlns = None
++ else:
++ xmlns = ("xmlns:%s" % prefix, namespace_uri)
++ else:
++ xmlns = None
++ return "%s:%s" % (prefix, tag), xmlns
++
+ # HTMLTreeBuilder does not exist in python 2.5 standard elementtree
+ from HTMLParser import HTMLParser
+ AUTOCLOSE = "p", "li", "tr", "th", "td", "head", "body"
+--- python-meld3-0.6.5.orig/meld3/test_meld3.py
++++ python-meld3-0.6.5/meld3/test_meld3.py
+@@ -1,6 +1,7 @@
+ import unittest
+ from StringIO import StringIO
+ import re
++import sys
+
+ _SIMPLE_XML = r"""<?xml version="1.0"?>
+ <root xmlns:meld="http://www.plope.com/software/meld3";>
+@@ -1671,9 +1672,13 @@
+ </html>"""
+
+ def test_unknown_entity(self):
+- from xml.parsers import expat
+- self.assertRaises(expat.error, self._parse,
+- '<html><head></head><body>&fleeb;</body></html>')
++ if sys.version_info[:3] >= (2,7,0):
++ self.assertRaises(SyntaxError, self._parse,
++
'<html><head></head><body>&fleeb;</body></html>')
++ else:
++ from xml.parsers import expat
++ self.assertRaises(expat.error, self._parse,
++
'<html><head></head><body>&fleeb;</body></html>')
+
+ def test_content_nostructure(self):
+ root = self._parse(_SIMPLE_XML)
diff -Nru python-meld3-0.6.5/debian/patches/series
python-meld3-0.6.5/debian/patches/series
--- python-meld3-0.6.5/debian/patches/series 1970-01-01 09:00:00.000000000
+0900
+++ python-meld3-0.6.5/debian/patches/series 2011-10-31 10:50:52.000000000
+0900
@@ -0,0 +1 @@
+fixtag_import_error_with_python2.7.patch
diff -Nru python-meld3-0.6.5/debian/source/format
python-meld3-0.6.5/debian/source/format
--- python-meld3-0.6.5/debian/source/format 1970-01-01 09:00:00.000000000
+0900
+++ python-meld3-0.6.5/debian/source/format 2011-10-31 10:45:28.000000000
+0900
@@ -0,0 +1 @@
+3.0 (quilt)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
