changeset 3220:8bfa8788da3d

merged main
author Mikko Virkkil? <mvirkkil@cc.hut.fi>
date Sun, 09 Mar 2008 14:46:07 +0100
parents 7d28998c3a25 (current diff) b06c048233f2 (diff)
children e9ab91483e02 6ca25943fd1a 76015771ce72
files
diffstat 3 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sun Mar 09 14:44:56 2008 +0100
+++ b/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sun Mar 09 14:46:07 2008 +0100
@@ -80,6 +80,14 @@
             result = self.parse(text)
             assert re.search(r'<p.*?>\s*Paragraph\s*', result)
 
+    def testStrangeP(self):
+        """ parser.wiki: empty line separates paragraphs """
+        result = self.parse("""<<BR>> <<BR>>
+
+foo ''bar'' baz.
+""")
+        assert re.search(r'foo <em>bar</em> baz', result)
+
 
 class TestHeadings(ParserTestCase):
     """ Test various heading problems """
@@ -229,12 +237,12 @@
         py.test.skip("Broken")
         cases = (
             # test, expected
-            ("text'''text\n", r"<p>text<strong>text\s*</strong></p>"),
-            ("text''text\n", r"<p>text<em>text\s*</em></p>"),
-            ("text__text\n", r"<p>text<span class=\"u\">text\s*</span></p>"),
+            ("text__text\n", r'<p[^>]*>text<span class="u">text\s*</span></p>'),
+            ("text''text\n", r'<p[^>]*>text<em>text\s*</em></p>'),
+            ("text'''text\n", r'<p[^>]*>text<strong>text\s*</strong></p>'),
             ("text ''em '''em strong __em strong underline",
-             r"text <em>em <strong>em strong <span class=\"u\">em strong underline"
-             r"\s*</span></strong></em></p>"),
+             r'text <em>em <strong>em strong <span class="u">em strong underline'
+             r'\s*</span></strong></em></p>'),
             )
         for test, expected in cases:
             result = self.parse(test)
@@ -486,8 +494,6 @@
     def testManyNestingPreBrackets(self):
         """ tests two nestings  ({{{ }}} and {{{ }}}) in one line for the wiki parser
         """
-        py.test.skip("Broken")
-
         raw = """{{{{
 Test {{{brackets}}} and test {{{brackets}}}
 }}}}"""
--- a/MoinMoin/request/request_wsgi.py	Sun Mar 09 14:44:56 2008 +0100
+++ b/MoinMoin/request/request_wsgi.py	Sun Mar 09 14:46:07 2008 +0100
@@ -34,7 +34,7 @@
         """ Override to create cgi form """
         form = cgi.FieldStorage(fp=self.stdin, environ=self.env, keep_blank_values=1)
         return RequestBase._setup_args_from_cgi_form(self, form)
-    
+
     def read(self, n=None):
         if n is None:
             return self.stdin.read()
--- a/wiki/config/more_samples/ldap_smb_farmconfig.py	Sun Mar 09 14:44:56 2008 +0100
+++ b/wiki/config/more_samples/ldap_smb_farmconfig.py	Sun Mar 09 14:46:07 2008 +0100
@@ -11,6 +11,8 @@
 
     This is a sample configuration for a farm using ldap and smb auth plugins.
 
+    !!! NEEDS UPDATE FOR MOIN 1.7 !!!
+
     It works like this:
     * user logs in via moin's form on UserPreferences
     * ldap_login plugin checks username/password against LDAP