Changeset 412 in products

Timestamp:

Jul 20, 2006 1:44:24 PM (20 years ago)

Author:

chervol

Message:

merged plone 2.1.x version to trunk

Location:

qTopic/trunk

Files:

• Extensions (copied) (copied from qTopic/trunk/Extensions)
• Extensions/Install.py (copied) (copied from qTopic/trunk/Extensions/Install.py)
• LICENSE.txt (copied) (copied from qTopic/trunk/LICENSE.txt)
• __init__.py (copied) (copied from qTopic/trunk/__init__.py)
• config.py (copied) (copied from qTopic/trunk/config.py)
• history.txt (copied) (copied from qTopic/trunk/history.txt)
• qTopic.py (copied) (copied from qTopic/trunk/qTopic.py)
• readme.txt (copied) (copied from qTopic/trunk/readme.txt)
• refresh.txt (copied) (copied from qTopic/trunk/refresh.txt)
• skins (copied) (copied from qTopic/trunk/skins)
• skins/qtopic (copied) (copied from qTopic/trunk/skins/qtopic)
• skins/qtopic/atct_macros.pt (copied) (copied from qTopic/branches/plone2.1/skins/qtopic/atct_macros.pt)
• skins/qtopic/atct_manageTopicIndex.cpt.metadata (copied) (copied from qTopic/branches/plone2.1/skins/qtopic/atct_manageTopicIndex.cpt.metadata)
• skins/qtopic/atct_manageTopicMetadata.cpt.metadata (copied) (copied from qTopic/branches/plone2.1/skins/qtopic/atct_manageTopicMetadata.cpt.metadata)
• skins/qtopic/export_csv.py (copied) (copied from qTopic/trunk/skins/qtopic/export_csv.py)
• skins/qtopic/getPGNewsletterSubscribers.py (copied) (copied from qTopic/branches/plone2.1/skins/qtopic/getPGNewsletterSubscribers.py)
• skins/qtopic/result_csv.pt (copied) (copied from qTopic/trunk/skins/qtopic/result_csv.pt)
• tests (copied) (copied from qTopic/branches/plone2.1/tests)
• tests/__init__.py (copied) (copied from qTopic/branches/plone2.1/tests/__init__.py)
• tests/framework.py (copied) (copied from qTopic/branches/plone2.1/tests/framework.py)
• tests/runalltests.py (copied) (copied from qTopic/branches/plone2.1/tests/runalltests.py)
• tests/test_topictool.py (copied) (copied from qTopic/branches/plone2.1/tests/test_topictool.py) (3 diffs)
• version.txt (copied) (copied from qTopic/trunk/version.txt)

qTopic/trunk/tests/test_topictool.py

@@ -26 +26 @@
 
 # z3 imports
-from Products.ATContentTypes.interface import IATCTTopicsTool as Z3IATCTTopicsTool
-from zope.interface.verify import verifyObject as Z3verifyObject
+try:
+    from Products.ATContentTypes.interface import IATCTTopicsTool as Z3IATCTTopicsTool
+    from zope.interface.verify import verifyObject as Z3verifyObject
+    z3_support = True
+except ImportError:
+    z3_support = False
 
 tool_config = zconf.atct_tool.topic_tool
@@ -58 +62 @@
         self.failUnless(IATCTTopicsTool.isImplementedBy(self.tool))
         self.failUnless(verifyObject(IATCTTopicsTool, self.tool))
-
-    def test_Z3interface(self):
-        iface = Z3IATCTTopicsTool
-        self.failUnless(Z3verifyObject(iface,self.tool))
+    
  
     #Index tests
@@ -321 +322 @@
             error = True
         self.assert_(error)
+    
+    if z3_support:
+        def test_Z3interface(self):
+            iface = Z3IATCTTopicsTool
+            self.failUnless(Z3verifyObject(iface,self.tool))
 
 tests.append(TestTool)