changeset 395:416fe98eb08f 1.5.1

1.5.1 release: bump revision, minor globaledit script and mail check fixes, updated test output, updated CHANGES imported from: moin--main--1.5--patch-399
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 22 Jan 2006 09:49:32 +0000
parents 4d58b19bd3a7
children 06b518ccacd7
files ChangeLog MoinMoin/multiconfig.py MoinMoin/scripts/globaledit.py MoinMoin/version.py docs/CHANGES moin.spec tests/make_test.out wiki/underlay.tar.bz2
diffstat 8 files changed, 93 insertions(+), 106 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jan 21 20:48:49 2006 +0000
+++ b/ChangeLog	Sun Jan 22 09:49:32 2006 +0000
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-01-22 10:49:32 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-399
+
+    Summary:
+      1.5.1 release: bump revision, minor globaledit script and mail check fixes, updated test output, updated CHANGES
+    Revision:
+      moin--main--1.5--patch-399
+
+    1.5.1 release: bump revision, minor globaledit script and mail check fixes, updated test output, updated CHANGES
+    
+
+    modified files:
+     ChangeLog MoinMoin/multiconfig.py
+     MoinMoin/scripts/globaledit.py MoinMoin/version.py
+     docs/CHANGES moin.spec tests/make_test.out
+     wiki/underlay.tar.bz2
+
+
 2006-01-21 21:48:49 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-398
 
     Summary:
--- a/MoinMoin/multiconfig.py	Sat Jan 21 20:48:49 2006 +0000
+++ b/MoinMoin/multiconfig.py	Sun Jan 22 09:49:32 2006 +0000
@@ -459,7 +459,7 @@
         self.lupy_searchers = []
 
         # check if mail is possible and set flag:
-        self.mail_enabled = not (self.mail_smarthost is None and self.mail_sendmail is None)
+        self.mail_enabled = (self.mail_smarthost is not None or self.mail_sendmail is not None) and self.mail_from
 
     def _config_check(self):
         """ Check namespace and warn about unknown names
--- a/MoinMoin/scripts/globaledit.py	Sat Jan 21 20:48:49 2006 +0000
+++ b/MoinMoin/scripts/globaledit.py	Sun Jan 22 09:49:32 2006 +0000
@@ -73,7 +73,7 @@
     if content_lines and content_lines[-1].strip(): # not an empty line at EOF
         content_lines.append('')
 
-    if masterpage.endswith('Template'):
+    if masterpage and masterpage.endswith('Template'):
         changedtext = master_lines + [format_line, language_line,] + pragma_lines + content_lines
     else:
         changedtext = comment_lines + master_lines + acl_lines + [format_line, language_line,] + pragma_lines + content_lines
--- a/MoinMoin/version.py	Sat Jan 21 20:48:49 2006 +0000
+++ b/MoinMoin/version.py	Sun Jan 22 09:49:32 2006 +0000
@@ -13,7 +13,7 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release  = '1.5.0'
+release  = '1.5.1'
 revision = patchlevel
 
 if __name__ == '__main__':
--- a/docs/CHANGES	Sat Jan 21 20:48:49 2006 +0000
+++ b/docs/CHANGES	Sun Jan 22 09:49:32 2006 +0000
@@ -1,49 +1,7 @@
 MoinMoin Version History
 ========================
 
-Version 1.5.current:
-  Fixes:
-    * Fixed rst parser docutils version check
-    * Repaired attachment unzipping feature.
-    * Fixed the AddRevision command of the PackageInstaller.
-    * improved the migration scripts (used to migrate pre-1.3 wikis to 1.3+):
-      * do not crash on empty lines in event log
-      * fix edit log format for very old moin data (like 0.11)
-      * workaround for an ugly win32 operating system bug leading to wiki text
-        file mtime not matching edit logs timestamp values if there was some
-        timezone change since last edit (e.g. a daylight saving tz switch),
-        but differing 3600s.
-        This affected pre-1.3 moin wiki servers running on win32 OS only.
-        We now try to correct those inconsistencies in mig05 by fuzzy matching.
-    * fixed bracketed link scheme icon (css class)
-    * we included a modified copy of Python 2.4.2's copy.py as some previous
-      python versions seem to have problems (2.3.x, x < 5 and also 2.4[.0]),
-      see: http://moinmoin.wikiwikiweb.de/MoinMoinBugs/DeepCopyError
-      Our own copy.py was slightly modified to run on 2.3.x and 2.4.x.
-    * Fixed the problem of not being able to change the date/time format back
-      to "Default" (UserPreferences).
-    * We generate the GUI editor footer now the same way as the text editor
-      footer.
-    * Include a CSS workaround for yet another IE bug, see:
-      MoinMoinBugs:InternetExplorerPeekABooBugInRightSideBar
-    * classic theme: added GUI editor link
-    * classic theme: added pagename header to editor screen
-
-  Other changes:
-    * Updated FCKeditor to current CVS (2006-01-08 == 2.2+)
-    * Split up show_hosts into show_hosts and show_names
-    * attachment:file%20with%20spaces.txt in attachment list
-    * added support for file:// in GUI editor link dialogue, see also:
-      MoinMoin:FileLinks
-    * cfg.mail_smarthost now supports "server:port" syntax, the default port
-      is 25, of course.
-    * removed unused kwargs showpage/editable/form from wikiutil.send_footer
-    * updated i18n (translation texts, additional languages)
-    * removed interwiki:pagename from print view's top of page, added it to
-      the "lasted edited" line at bottom right.
-
-
-Version 1.5.0:
+Version 1.5.1:
   Please completely read CHANGES text until you reach the version you were
   using until now. Otherwise you might miss some important upgrading and
   configuration hints.
@@ -76,6 +34,49 @@
       $ make test >tests/make_test.out
 
   Fixes:
+    * Fixed rst parser docutils version check
+    * Repaired attachment unzipping feature.
+    * Fixed the AddRevision command of the PackageInstaller.
+    * improved the migration scripts (used to migrate pre-1.3 wikis to 1.3+):
+      * do not crash on empty lines in event log
+      * fix edit log format for very old moin data (like 0.11)
+      * workaround for an ugly win32 operating system bug leading to wiki text
+        file mtime not matching edit logs timestamp values if there was some
+        timezone change since last edit (e.g. a daylight saving tz switch),
+        but differing 3600s.
+        This affected pre-1.3 moin wiki servers running on win32 OS only.
+        We now try to correct those inconsistencies in mig05 by fuzzy matching.
+    * fixed bracketed link scheme icon (css class)
+    * we included a modified copy of Python 2.4.2's copy.py as some previous
+      python versions seem to have problems (2.3.x, x < 5 and also 2.4[.0]),
+      see: http://moinmoin.wikiwikiweb.de/MoinMoinBugs/DeepCopyError
+      Our own copy.py was slightly modified to run on 2.3.x and 2.4.x.
+    * Fixed the problem of not being able to change the date/time format back
+      to "Default" (UserPreferences).
+    * We generate the GUI editor footer now the same way as the text editor
+      footer.
+    * Include a CSS workaround for yet another IE bug, see:
+      MoinMoinBugs:InternetExplorerPeekABooBugInRightSideBar
+    * classic theme: added GUI editor link
+    * classic theme: added pagename header to editor screen
+    * the "mail enabled" check now also checks whether mail_from is set
+
+  Other changes:
+    * Updated FCKeditor to current CVS (2006-01-08 == 2.2+)
+    * Split up show_hosts into show_hosts and show_names
+    * attachment:file%20with%20spaces.txt in attachment list
+    * added support for file:// in GUI editor link dialogue, see also:
+      MoinMoin:FileLinks
+    * cfg.mail_smarthost now supports "server:port" syntax, the default port
+      is 25, of course.
+    * removed unused kwargs showpage/editable/form from wikiutil.send_footer
+    * updated i18n (translation texts, additional languages)
+    * removed interwiki:pagename from print view's top of page, added it to
+      the "lasted edited" line at bottom right.
+
+
+Version 1.5.0:
+  Fixes:
     * Fix <x=y> table attributes parsing. Thanks to Reimar Bauer.
     * Fixed a few bugs in the reStructured text parser. Note that you
       need to install docutils 0.3.10 or newer (snapshot from December 2005
--- a/moin.spec	Sat Jan 21 20:48:49 2006 +0000
+++ b/moin.spec	Sun Jan 22 09:49:32 2006 +0000
@@ -1,5 +1,5 @@
 %define name moin
-%define version 1.5.0
+%define version 1.5.1
 %define release 1
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
--- a/tests/make_test.out	Sat Jan 21 20:48:49 2006 +0000
+++ b/tests/make_test.out	Sun Jan 22 09:49:32 2006 +0000
@@ -72,15 +72,15 @@
 testNoWikiWord01 (MoinMoin._tests.test_converter_text_html_text_x_moin.ConvertInlineItemRepeatableTests) ... FAIL
 testSmiley01 (MoinMoin._tests.test_converter_text_html_text_x_moin.ConvertInlineItemRepeatableTests) ... FAIL
 testWikiWord01 (MoinMoin._tests.test_converter_text_html_text_x_moin.ConvertInlineItemRepeatableTests) ... ok
-test1 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ERROR
-test2 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ERROR
-test3 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ERROR
-test4 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ERROR
+test1 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ok
+test2 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... FAIL
+test3 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ok
+test4 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests) ... ok
 error: access error like a dict ... ok
 error: create with encoded string ... ok
 error: create with any object ... ok
 error: create with unicode ... ok
-testSyntaxReference (MoinMoin._tests.test_formatter.FormatterTestCase) ... Formatting using <class MoinMoin.formatter.dom_xml.Formatter at 0x55bd1bfc>
+testSyntaxReference (MoinMoin._tests.test_formatter.FormatterTestCase) ... Formatting using <class MoinMoin.formatter.dom_xml.Formatter at 0x55d35b6c>
 [('xml', {}), ('p', {'type': 'ol'}), ('ol', {'start': None, 'type': u'1'}), ('li', {})]
 ERROR
 testQuoting (MoinMoin._tests.test_packages.QuotingTestCase) ... ok
@@ -207,54 +207,6 @@
 wikixml.marshal: setting marshal property ... ok
 
 ======================================================================
-ERROR: test1 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1081, in test1
-    self.do(test, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1074, in do
-    super(StripWhitespaceTests, self).do(converter.strip_whitespace, text, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1064, in do
-    raise _tests.TestSkiped('xml.dom.ext module is not available')
-TestSkipped: xml.dom.ext module is not available
-
-======================================================================
-ERROR: test2 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1090, in test2
-    self.do(test, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1074, in do
-    super(StripWhitespaceTests, self).do(converter.strip_whitespace, text, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1064, in do
-    raise _tests.TestSkiped('xml.dom.ext module is not available')
-TestSkipped: xml.dom.ext module is not available
-
-======================================================================
-ERROR: test3 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1104, in test3
-    self.do(test, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1074, in do
-    super(StripWhitespaceTests, self).do(converter.strip_whitespace, text, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1064, in do
-    raise _tests.TestSkiped('xml.dom.ext module is not available')
-TestSkipped: xml.dom.ext module is not available
-
-======================================================================
-ERROR: test4 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1109, in test4
-    self.do(test, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1074, in do
-    super(StripWhitespaceTests, self).do(converter.strip_whitespace, text, output)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1064, in do
-    raise _tests.TestSkiped('xml.dom.ext module is not available')
-TestSkipped: xml.dom.ext module is not available
-
-======================================================================
 ERROR: testSyntaxReference (MoinMoin._tests.test_formatter.FormatterTestCase)
 ----------------------------------------------------------------------
 Traceback (most recent call last):
@@ -262,11 +214,14 @@
     self.formatPage("SyntaxReference", formatter)
   File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_formatter.py", line 45, in formatPage
     return self.request.redirectedOutput(page.send_page, self.request)
-  File "/srv/moin_tw/moin--main--1.5/MoinMoin/request.py", line 631, in redirectedOutput
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/request.py", line 625, in redirectedOutput
     function(*args, **kw)
-  File "../../MoinMoin/Page.py", line 1241, in send_page
-  File "../../MoinMoin/Page.py", line 1321, in send_page_content
-  File "../../MoinMoin/Page.py", line 1339, in format
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/Page.py", line 1241, in send_page
+    start_line=pi_lines)
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/Page.py", line 1320, in send_page_content
+    self.format(parser)
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/Page.py", line 1337, in format
+    parser.format(self.formatter)
   File "/srv/moin_tw/moin--main--1.5/MoinMoin/parser/wiki.py", line 1044, in format
     numstart))
   File "/srv/moin_tw/moin--main--1.5/MoinMoin/parser/wiki.py", line 552, in _indent_to
@@ -832,6 +787,20 @@
 AssertionError: fails with parse error: ExpatError: mismatched tag: line 376, column 83
 
 ======================================================================
+FAIL: test2 (MoinMoin._tests.test_converter_text_html_text_x_moin.StripWhitespaceTests)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1090, in test2
+    self.do(test, output)
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1074, in do
+    super(StripWhitespaceTests, self).do(converter.strip_whitespace, text, output)
+  File "/srv/moin_tw/moin--main--1.5/MoinMoin/_tests/test_converter_text_html_text_x_moin.py", line 1066, in do
+    self.failUnlessEqual("<?xml version='1.0' encoding='UTF-8'?>%s" % output, out.getvalue().decode("utf-8"))
+  File "/usr/lib/python2.3/unittest.py", line 302, in failUnlessEqual
+    raise self.failureException, \
+AssertionError: u"<?xml version='1.0' encoding='UTF-8'?><t><z/></t>" != u"<?xml version='1.0' encoding='UTF-8'?><t>\n  <z/>\n</t>"
+
+======================================================================
 FAIL: parser.wiki: empty lines before block element ignored
 ----------------------------------------------------------------------
 Traceback (most recent call last):
@@ -895,6 +864,6 @@
 AssertionError: "FrontPage" is NOT a system page
 
 ----------------------------------------------------------------------
-Ran 202 tests in 8.352s
+Ran 202 tests in 8.106s
 
-FAILED (failures=51, errors=5)
+FAILED (failures=52, errors=1)
Binary file wiki/underlay.tar.bz2 has changed