Update of /cvs-repository/Products/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv4941/CMFDefault/tests
Modified Files:
Tag: CMF-1_5-branch
test_DefaultWorkflow.py test_DiscussionReply.py
test_DiscussionTool.py test_Discussions.py test_Document.py
test_DublinCore.py test_Favorite.py test_Link.py
test_MembershipTool.py test_MetadataTool.py test_NewsItem.py
test_Portal.py test_PropertiesTool.py test_RegistrationTool.py
test_all.py test_join.py test_utils.py
Log Message:
- Remove bare except in BBB imports.
=== Products/CMFDefault/tests/test_DefaultWorkflow.py 1.4.8.2 => 1.4.8.3 ===
--- Products/CMFDefault/tests/test_DefaultWorkflow.py:1.4.8.2 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_DefaultWorkflow.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_DiscussionReply.py 1.1.4.4 => 1.1.4.5 ===
--- Products/CMFDefault/tests/test_DiscussionReply.py:1.1.4.4 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_DiscussionReply.py Fri Jul 8 09:24:32 2005
@@ -7,7 +7,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_DiscussionTool.py 1.5.4.2 => 1.5.4.3 ===
--- Products/CMFDefault/tests/test_DiscussionTool.py:1.5.4.2 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_DiscussionTool.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_Discussions.py 1.19.6.4 => 1.19.6.5 ===
--- Products/CMFDefault/tests/test_Discussions.py:1.19.6.4 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_Discussions.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_Document.py 1.37.2.6 => 1.37.2.7 ===
--- Products/CMFDefault/tests/test_Document.py:1.37.2.6 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_Document.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_DublinCore.py 1.6.2.5 => 1.6.2.6 ===
--- Products/CMFDefault/tests/test_DublinCore.py:1.6.2.5 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_DublinCore.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_Favorite.py 1.10.2.1 => 1.10.2.2 ===
--- Products/CMFDefault/tests/test_Favorite.py:1.10.2.1 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_Favorite.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_Link.py 1.12.2.2 => 1.12.2.3 ===
--- Products/CMFDefault/tests/test_Link.py:1.12.2.2 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_Link.py Fri Jul 8 09:24:32 2005
@@ -2,7 +2,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_MembershipTool.py 1.12.8.2 => 1.12.8.3 ===
--- Products/CMFDefault/tests/test_MembershipTool.py:1.12.8.2 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_MembershipTool.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_MetadataTool.py 1.11.2.2 => 1.11.2.3 ===
--- Products/CMFDefault/tests/test_MetadataTool.py:1.11.2.2 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_MetadataTool.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_NewsItem.py 1.12.2.2 => 1.12.2.3 ===
--- Products/CMFDefault/tests/test_NewsItem.py:1.12.2.2 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_NewsItem.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_Portal.py 1.7.2.1 => 1.7.2.2 ===
--- Products/CMFDefault/tests/test_Portal.py:1.7.2.1 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_Portal.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_PropertiesTool.py 1.4.8.2 => 1.4.8.3 ===
--- Products/CMFDefault/tests/test_PropertiesTool.py:1.4.8.2 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_PropertiesTool.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_RegistrationTool.py 1.5.6.4 => 1.5.6.5 ===
--- Products/CMFDefault/tests/test_RegistrationTool.py:1.5.6.4 Fri Jul 8
08:28:30 2005
+++ Products/CMFDefault/tests/test_RegistrationTool.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_all.py 1.16.2.1 => 1.16.2.2 ===
--- Products/CMFDefault/tests/test_all.py:1.16.2.1 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_all.py Fri Jul 8 09:24:32 2005
@@ -19,7 +19,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_join.py 1.11.8.2 => 1.11.8.3 ===
--- Products/CMFDefault/tests/test_join.py:1.11.8.2 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_join.py Fri Jul 8 09:24:32 2005
@@ -2,7 +2,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
=== Products/CMFDefault/tests/test_utils.py 1.12.8.4 => 1.12.8.5 ===
--- Products/CMFDefault/tests/test_utils.py:1.12.8.4 Fri Jul 8 08:28:30 2005
+++ Products/CMFDefault/tests/test_utils.py Fri Jul 8 09:24:32 2005
@@ -2,7 +2,7 @@
import Testing
try:
import Zope2
-except: # BBB: for Zope 2.7
+except ImportError: # BBB: for Zope 2.7
import Zope as Zope2
Zope2.startup()
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
