Changeset 1795

Timestamp:

11/14/08 11:05:22 (16 months ago)

Author:

JensDiemer

Message:

Bugfix in creole markup: Wrong image RE, see: http://www.pylucid.org/phpBB2/viewtopic.php?t=256 Thx. Hirmus

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

@@ -71 +71 @@
     image = r'''(?P<image>
             {{
-            (?P<image_target>.+?\.jpg|\.jpeg|\.gif|\.png) \s*
+            (?P<image_target>.+?(\.jpg|\.jpeg|\.gif|\.png)) \s*
             (\| \s* (?P<image_text>.+?) \s*)?
             }}

trunk/pylucid_project/tests/markup_creole.py

@@ -147 +147 @@
             <strong><a href="Shortcut2">a page2</a></strong><br />
             <i><strong><a href="Shortcut3">a page3</a></strong></i></p>
+        """)
+        
+    def test_image(self):
+        self.assertCreole(r"""
+            a {{/image.jpg|JPG pictures}} and
+            a {{/image.jpeg|JPEG pictures}} and
+            a {{/image.gif|GIF pictures}} and
+            a {{/image.png|PNG pictures}} !
+        """, """
+            <p>a <img src="/image.jpg" alt="JPG pictures"> and<br />
+            a <img src="/image.jpeg" alt="JPEG pictures"> and<br />
+            a <img src="/image.gif" alt="GIF pictures"> and<br />
+            a <img src="/image.png" alt="PNG pictures"> !</p>
         """)