# HG changeset patch # User hodgestar # Date 1299744989 0 # Node ID 5dcabf565db1337f467d7d6e05561b05701b2099 # Parent 80762e02961714368b984189176dabc819cdb619 Merge r1148 from trunk (fix for qname equality issue #413). diff --git a/genshi/core.py b/genshi/core.py --- a/genshi/core.py +++ b/genshi/core.py @@ -711,7 +711,8 @@ if type(qname) is cls: return qname - parts = qname.lstrip('{').split('}', 1) + qname = qname.lstrip('{') + parts = qname.split('}', 1) if len(parts) > 1: self = unicode.__new__(cls, '{%s' % qname) self.namespace, self.localname = map(unicode, parts) diff --git a/genshi/tests/core.py b/genshi/tests/core.py --- a/genshi/tests/core.py +++ b/genshi/tests/core.py @@ -236,6 +236,13 @@ self.assertEquals('http://www.example.org/namespace', qname.namespace) self.assertEquals('elem', qname.localname) + def test_curly_brace_equality(self): + qname1 = QName('{http://www.example.org/namespace}elem') + qname2 = QName('http://www.example.org/namespace}elem') + self.assertEqual(qname1.namespace, qname2.namespace) + self.assertEqual(qname1.localname, qname2.localname) + self.assertEqual(qname1, qname2) + def suite(): suite = unittest.TestSuite()