changeset 628:dcb874ba84ba

merge moin/1.5
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 07 May 2006 21:09:09 +0200
parents 088282ae5cf3 (current diff) b8e8697ea0af (diff)
children cdfb01bec122
files
diffstat 7 files changed, 26 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/__init__.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/__init__.py	Sun May 07 21:09:09 2006 +0200
@@ -1,6 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 """
-MoinMoin Version 1.5.3 patch-577
+MoinMoin Version 1.5.3 219ffcdc211a tip
 
 @copyright: 2000-2006 by Jürgen Hermann <jh@web.de>
 @license: GNU GPL, see COPYING for details.
--- a/MoinMoin/macro/MonthCalendar.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/macro/MonthCalendar.py	Sun May 07 21:09:09 2006 +0200
@@ -311,11 +311,11 @@
     p = Page(request, thispage)
     qpagenames = '*'.join(map(wikiutil.quoteWikinameURL, parmpagename))
     qtemplate = wikiutil.quoteWikinameURL(parmtemplate)
-    querystr = "calparms=%s,%d,%d,%d,%%d,%s" % (qpagenames, parmyear, parmmonth, parmoffset, qtemplate)
-    prevlink  = p.url(request, querystr % (parmoffset2 - 1), 0)
-    nextlink  = p.url(request, querystr % (parmoffset2 + 1), 0)
-    prevylink = p.url(request, querystr % (parmoffset2 - 12), 0)
-    nextylink = p.url(request, querystr % (parmoffset2 + 12), 0)
+    querystr = "calparms=%%s,%d,%d,%d,%%d,%%s" % (parmyear, parmmonth, parmoffset)
+    prevlink  = p.url(request, querystr % (qpagenames, parmoffset2 - 1, qtemplate), 0)
+    nextlink  = p.url(request, querystr % (qpagenames, parmoffset2 + 1, qtemplate), 0)
+    prevylink = p.url(request, querystr % (qpagenames, parmoffset2 - 12, qtemplate), 0)
+    nextylink = p.url(request, querystr % (qpagenames, parmoffset2 + 12, qtemplate), 0)
     prevmonth = formatter.url(1, prevlink, 'cal-link') + '&lt;' + formatter.url(0)
     nextmonth = formatter.url(1, nextlink, 'cal-link') + '&gt;' + formatter.url(0)
     prevyear  = formatter.url(1, prevylink, 'cal-link') + '&lt;&lt;' + formatter.url(0)
--- a/MoinMoin/multiconfig.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/multiconfig.py	Sun May 07 21:09:09 2006 +0200
@@ -352,9 +352,9 @@
 
     # a regex of HTTP_USER_AGENTS that should be excluded from logging
     # and receive a FORBIDDEN for anything except viewing a page
-    ua_spiders = ('archiver|cfetch|crawler|curl|gigabot|google|holmes|htdig|httrack|httpunit|jeeves|larbin|leech|'
+    ua_spiders = ('archiver|cfetch|crawler|curl|gigabot|googlebot|holmes|htdig|httrack|httpunit|jeeves|larbin|leech|'
                   'linkbot|linkmap|linkwalk|mercator|mirror|msnbot|nutbot|omniexplorer|puf|robot|scooter|'
-                  'search|sherlock|sitecheck|spider|teleport|voyager|webreaper|wget')
+                  'sherlock|slurp|sitecheck|spider|teleport|voyager|webreaper|wget')
 
     # Wiki identity
     sitename = u'Untitled Wiki'
--- a/MoinMoin/parser/rst.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/parser/rst.py	Sun May 07 21:09:09 2006 +0200
@@ -165,6 +165,11 @@
                                  self)
         self.document.walkabout(visitor)
         self.visitor = visitor
+        # Docutils 0.5.0 and later require the writer to have the visitor 
+        # attributes.
+        if (hasattr(html4css1.Writer, 'visitor_attributes')):
+            for attr in html4css1.Writer.visitor_attributes:
+                setattr(self, attr, getattr(visitor, attr))
         self.output = html_escape_unicode(visitor.astext())
 
 class Parser:
@@ -189,6 +194,7 @@
                 'file_insertion_enabled': 0,
                 'raw_enabled': 0,
                 'stylesheet_path': '',
+                'template': '',
             }
         )
 
--- a/MoinMoin/user.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/user.py	Sun May 07 21:09:09 2006 +0200
@@ -960,7 +960,7 @@
 
 Login Password: %s
 
-Login URL: %s/%s
+Login URL: %s/%s?action=login
 """, formatted=False) % (
                         self.name, self.enc_password, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
 
--- a/MoinMoin/util/mail.py	Sun May 07 18:04:51 2006 +0200
+++ b/MoinMoin/util/mail.py	Sun May 07 21:09:09 2006 +0200
@@ -75,7 +75,7 @@
     charset.header_encoding = QP
     charset.body_encoding = QP
     msg.set_charset(charset)    
-    msg.set_payload(text)
+    msg.set_payload(charset.body_encode(text))
     
     # Create message headers
     # Don't expose emails addreses of the other subscribers, instead we
--- a/docs/CHANGES	Sun May 07 18:04:51 2006 +0200
+++ b/docs/CHANGES	Sun May 07 21:09:09 2006 +0200
@@ -33,6 +33,16 @@
     * We switched to Mercurial SCM, see here for more infos:
       http://moinmoin.wikiwikiweb.de/MoinDev/MercurialGuide
 
+  Bugfixes:
+    * fix MonthCalendar macro for non-ASCII pagenames (thanks to Jonas Smedegaard)
+    * remove 'search' and 'google' from bot user agent list and add some more
+      specific terms
+    * Fix the forgotten password email login URL and also properly encode the
+      email body. Thanks to Robin Dunn for the patch.
+    * Applied a patch by Matthew Gilbert for increased compatiblity with
+      latest docutils.
+
+
 Version 1.5.3:
   New Features:
     * Added CSS classes for TableOfContents macro.