Changeset 1774

Timestamp:

09/24/08 16:18:02 (2 months ago)

Author:

JensDiemer

Message:

• Creole lineending bugfix: convert all lineendings to \n
  
• Add a test for this.
  

Location:

trunk/pylucid_project

Files:

• PyLucid/system/markups/creole.py (modified) (1 diff)
• tests/markup_creole.py (modified) (1 diff)

trunk/pylucid_project/PyLucid/system/markups/creole.py

@@ -521 +521 @@
     def parse(self):
         """Parse the text given as self.raw and return DOM tree."""
-        self.parse_block(self.raw)
+        # convert all lineendings to \n
+        text = self.raw.replace("\r\n", "\n").replace("\r", "\n")
+        self.parse_block(text)
         return self.root
 

trunk/pylucid_project/tests/markup_creole.py

@@ -87 +87 @@
         out_string = self._parse("a text line.")
         self.assertEqual(out_string, "<p>a text line.</p>\n")
+
+    def test_lineendings(self):
+        """ Test all existing lineending version """
+        out_string = self._parse(u"first\nsecond")
+        self.assertEqual(out_string, u"<p>first<br />\nsecond</p>\n")
+        
+        out_string = self._parse(u"first\rsecond")
+        self.assertEqual(out_string, u"<p>first<br />\nsecond</p>\n")
+        
+        out_string = self._parse(u"first\r\nsecond")
+        self.assertEqual(out_string, u"<p>first<br />\nsecond</p>\n")
 
     def test_creole_linebreak(self):