changeset 3843:42c4d8d6a80c

merge some fixes from 1.7
author Johannes Berg <johannes AT sipsolutions DOT net>
date Mon, 14 Jul 2008 13:07:34 +0200
parents 9e960a76d2c8 (current diff) a37ed69fafed (diff)
children 5c91b9e2b9fc
files MoinMoin/parser/_tests/test_unicode.py docs/CHANGES
diffstat 2 files changed, 26 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/Xapian.py	Mon Jul 14 02:11:55 2008 +0200
+++ b/MoinMoin/search/Xapian.py	Mon Jul 14 13:07:34 2008 +0200
@@ -74,7 +74,6 @@
     token_re = re.compile(
         r"(?P<company>\w+[&@]\w+)|" + # company names like AT&T and Excite@Home.
         r"(?P<email>\w+([.-]\w+)*@\w+([.-]\w+)*)|" +    # email addresses
-        r"(?P<hostname>\w+(\.\w+)+)|" +                 # hostnames
         r"(?P<acronym>(\w\.)+)|" +          # acronyms: U.S.A., I.B.M., etc.
         r"(?P<word>\w+)",                   # words (including WikiWords)
         re.U)
@@ -137,11 +136,6 @@
                         if word:
                             yield (word, m.start() + displ)
                             displ += len(word) + 1
-                elif m.group("hostname"):
-                    displ = 0
-                    for word in self.dot_re.split(m.group("hostname")):
-                        yield (word, m.start() + displ)
-                        displ += len(word) + 1
                 elif m.group("word"):
                     for word, pos in self.raw_tokenize_word(m.group("word"), m.start()):
                         yield word, pos
--- a/docs/CHANGES	Mon Jul 14 02:11:55 2008 +0200
+++ b/docs/CHANGES	Mon Jul 14 13:07:34 2008 +0200
@@ -40,6 +40,32 @@
   New Features:
     * per-parser quickhelp, 'quickhelp' class variable of parser class
 
+Version 1.7.current:
+  Fixes:
+    * Security fix: XSS fix for advanced search form
+    * Avoid creation of new pagedirs with empty edit-log files by just
+      accessing a non-existant page. If you used 1.7 before, you likely have
+      quite some trash pagedirs now and you can clean them up by using:
+      moin --config-dir=... --wiki-url=... maint cleanpage
+      This will output some shell script (please review it before running!)
+      that can be used to move trash pages into some trash/ directory and also
+      moves deleted pages into some deleted/ directory. Maybe keep a copy of
+      those directories for a while just for the case.
+    * Standalone server: fix --pidfile option
+    * Search:
+      * Xapian indexing: Removed crappy "hostname" tokenization.
+        Fixes MoinMoinBugs/1.7 XapianNotWorkingWithLeadingNumbersInTitle.
+      * Make query parser reject more invalid input.
+      * If query parsing raises a BracketError, at least tell what the problem
+        is (and not just raise empty  ValueError).
+     * Category search: ignore traling whitespace after ----
+    * Argument parser:
+      * Fixed sort() usage in UnitArgument to be Python 2.3 compatible.
+      * Fixed MoinMoinBugs/TypeErrorInWikiutils.
+    * TableOfContents macro: skip outer-most <ol> levels when page isn't using
+      the biggest headings
+    * OpenID RP: make it compatible to python-openid 2.2.x
+    * PackagePages.collectpackage: removed encoding from file name of zipfile
 
 Version 1.7.0:
   Note: This is a reduced CHANGES, ommitting details from rc/beta test and