[CMF-checkins] CVS: CMF - CHANGES.txt:1.248.2.138 all_cmf_tests.py:1.13.2.1

[Tres Seaver]

Update of /cvs-repository/CMF
In directory cvs.zope.org:/tmp/cvs-serv17354

Modified Files:
      Tag: CMF-1_5-branch
	CHANGES.txt all_cmf_tests.py 
Log Message:


 - Moved tests which used to 'import Zope' to try 'import Zope2'
   (with a fallback for Zope 2.7).  Thanks to sacco for the patch!
   (http://www.zope.org/Collectors/CMF/362)



=== CMF/CHANGES.txt 1.248.2.137 => 1.248.2.138 ===
--- CMF/CHANGES.txt:1.248.2.137	Thu Jul  7 16:19:08 2005
+++ CMF/CHANGES.txt	Fri Jul  8 08:28:28 2005
@@ -3,7 +3,7 @@
   Features Added
 
     - CMFDefault/skins/zpt_generic/talkback_tree:  Add link to allow
-      managers to delete replies (http://www.zope.org/Collectors/38).
+      managers to delete replies (http://www.zope.org/Collectors/CMF/38).
 
   Bugs Fixed
 
@@ -13,21 +13,21 @@
 
     - CMFDefault.utils.formatRFC822Headers:  strip trailing blank line
       of multi-line value, to prevent premature halt of parsing.
-      (http://www.zope.org/Collectors/230)
+      (http://www.zope.org/Collectors/CMF/230)
 
     - CMFCore.MembershipTool:  allow 'getMemberById' to crawl up the
       hierarchy of user folders until it finds the user.
-      (http://www.zope.org/Collectors/354, also
-       http://www.zope.org/Collectors/63)
+      (http://www.zope.org/Collectors/CMF/354, also
+       http://www.zope.org/Collectors/CMF/63)
 
     - CatalogTool: Added manage_convertIndexes.
       This method should not be used with Zope 2.7. It overrides the broken
       manage_convertIndexes of Zope 2.8.0.
-      (http://www.zope.org/Collectors/357)
+      (http://www.zope.org/Collectors/CMF/357)
 
     - CMFCore.WorkflowTool:  Make (deprecated) WorkflowInformation objects
       schema-compatible with current ActionInformation.
-      (http://www.zope.org/Collectors/355)
+      (http://www.zope.org/Collectors/CMF/355)
 
     - CMFCore.utils.ToolInit: For icon registration to work with ToolInit
       you would have to have the same product_name parameter as the actual
@@ -41,6 +41,10 @@
 
   Others
 
+    - Moved tests which used to 'import Zope' to try 'import Zope2'
+      (with a fallback for Zope 2.7).  Thanks to sacco for the patch!
+      (http://www.zope.org/Collectors/CMF/362)
+
     - CatalogTool: Removed obsolete Vocabulary.
 
 CMF 1.5.2beta1 (2005/06/26)
@@ -107,7 +111,7 @@
       earlier Zopes used to raise KeyError.
 
     - Set cache headers in 304 responses from FSImage / FSFile
-      (http://www.zope.org/Collectors/355)
+      (http://www.zope.org/Collectors/CMF/355)
 
     - CMFCore.DirectoryView: Do not cause ZODB writes or ConflictError
       if an old DirectoryView with a non-existing path is left. Sends a
@@ -225,7 +229,7 @@
       (http://www.zope.org/Collectors/CMF/114)
 
     - CMFDefault.DublinCore: Force local timezone when displaying date
-      metadata. ( http://www.zope.org/Collectors/CMF/325 )
+      metadata. (http://www.zope.org/Collectors/CMF/325)
 
     - CMFCore.SkinsTool: Prevent adding skin layers with invalid path elements
       There is a disconnect between the ability to define what can be ignored


=== CMF/all_cmf_tests.py 1.13 => 1.13.2.1 ===
--- CMF/all_cmf_tests.py:1.13	Thu Aug 12 11:07:36 2004
+++ CMF/all_cmf_tests.py	Fri Jul  8 08:28:28 2005
@@ -19,8 +19,11 @@
 
 import unittest
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 import getopt
 import sys