Changeset 1220

Timestamp:

Jan 26, 2013, 6:28:46 PM (11 years ago)

Author:

hodgestar

Message:

Merge r1219 from trunk (fix for PIs without data, fixes #368).

Location:

branches/stable/0.7.x

Files:

• . (modified) (1 prop)
• genshi/input.py (modified) (1 diff)
• genshi/tests/input.py (modified) (1 diff)

branches/stable/0.7.x/genshi/input.py

@@ -406 +406 @@
 
     def handle_pi(self, data):
-        target, data = data.split(None, 1)
         if data.endswith('?'):
             data = data[:-1]
+        try:
+            target, data = data.split(None, 1)
+        except ValueError:
+            # PI with no data
+            target = data
+            data = ''
         self._enqueue(PI, (target.strip(), data.strip()))
 

branches/stable/0.7.x/genshi/tests/input.py

@@ -178 +178 @@
         self.assertEqual('echo "Foobar"', data)
 
+    def test_processing_instruction_no_data_1(self):
+        text = u'<?foo ?>'
+        events = list(HTMLParser(StringIO(text)))
+        kind, (target, data), pos = events[0]
+        self.assertEqual(Stream.PI, kind)
+        self.assertEqual('foo', target)
+        self.assertEqual('', data)
+
+    def test_processing_instruction_no_data_2(self):
+        text = u'<?experiment>...<?/experiment>'
+        events = list(HTMLParser(StringIO(text)))
+        kind, (target, data), pos = events[0]
+        self.assertEqual(Stream.PI, kind)
+        self.assertEqual('experiment', target)
+        self.assertEqual('', data)
+        kind, (target, data), pos = events[2]
+        self.assertEqual('/experiment', target)
+        self.assertEqual('', data)
+
     def test_xmldecl(self):
         text = '<?xml version="1.0" ?><root />'