Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFSetup/tests
Modified Files:
test_actions.py test_all.py test_context.py test_differ.py
test_properties.py test_registry.py test_rolemap.py
test_skins.py test_tool.py test_typeinfo.py test_utils.py
test_workflow.py
Log Message:
- Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.
=== CMF/CMFSetup/tests/test_actions.py 1.13 => 1.14 ===
--- CMF/CMFSetup/tests/test_actions.py:1.13 Wed Apr 13 09:05:58 2005
+++ CMF/CMFSetup/tests/test_actions.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Acquisition import Implicit
from Acquisition import aq_parent
=== CMF/CMFSetup/tests/test_all.py 1.16 => 1.17 ===
--- CMF/CMFSetup/tests/test_all.py:1.16 Fri Dec 17 12:51:10 2004
+++ CMF/CMFSetup/tests/test_all.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.utils import build_test_suite
=== CMF/CMFSetup/tests/test_context.py 1.12 => 1.13 ===
--- CMF/CMFSetup/tests/test_context.py:1.12 Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/tests/test_context.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import os
import time
=== CMF/CMFSetup/tests/test_differ.py 1.3 => 1.4 ===
--- CMF/CMFSetup/tests/test_differ.py:1.3 Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/tests/test_differ.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
from OFS.Image import File
=== CMF/CMFSetup/tests/test_properties.py 1.2 => 1.3 ===
--- CMF/CMFSetup/tests/test_properties.py:1.2 Fri Dec 17 12:51:10 2004
+++ CMF/CMFSetup/tests/test_properties.py Wed Jun 15 10:17:39 2005
@@ -14,11 +14,10 @@
$Id$
"""
-
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_registry.py 1.17 => 1.18 ===
--- CMF/CMFSetup/tests/test_registry.py:1.17 Sun Mar 20 16:19:47 2005
+++ CMF/CMFSetup/tests/test_registry.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
from Products.CMFSetup.tests.common import BaseRegistryTests
=== CMF/CMFSetup/tests/test_rolemap.py 1.8 => 1.9 ===
--- CMF/CMFSetup/tests/test_rolemap.py:1.8 Tue Dec 14 15:56:58 2004
+++ CMF/CMFSetup/tests/test_rolemap.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_skins.py 1.16 => 1.17 ===
--- CMF/CMFSetup/tests/test_skins.py:1.16 Sat May 7 08:44:39 2005
+++ CMF/CMFSetup/tests/test_skins.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import os
=== CMF/CMFSetup/tests/test_tool.py 1.18 => 1.19 ===
--- CMF/CMFSetup/tests/test_tool.py:1.18 Sun Mar 20 16:19:47 2005
+++ CMF/CMFSetup/tests/test_tool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from StringIO import StringIO
=== CMF/CMFSetup/tests/test_typeinfo.py 1.17 => 1.18 ===
--- CMF/CMFSetup/tests/test_typeinfo.py:1.17 Mon Jun 13 13:56:43 2005
+++ CMF/CMFSetup/tests/test_typeinfo.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
=== CMF/CMFSetup/tests/test_utils.py 1.8 => 1.9 ===
--- CMF/CMFSetup/tests/test_utils.py:1.8 Fri Jun 10 14:30:35 2005
+++ CMF/CMFSetup/tests/test_utils.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from DateTime.DateTime import DateTime
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_workflow.py 1.29 => 1.30 ===
--- CMF/CMFSetup/tests/test_workflow.py:1.29 Thu Apr 7 12:38:47 2005
+++ CMF/CMFSetup/tests/test_workflow.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
from Products.PythonScripts.PythonScript import PythonScript
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
