[CMF-checkins] CVS: CMF/CMFTopic - Topic.py:1.36

[Yvo Schubbe]

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

Modified Files:
	Topic.py 
Log Message:
- fixed bare except and adjusted tests
- removed redundant icon method (DynamicType defines icon)


=== CMF/CMFTopic/Topic.py 1.35 => 1.36 ===
--- CMF/CMFTopic/Topic.py:1.35	Mon Dec  1 08:55:45 2003
+++ CMF/CMFTopic/Topic.py	Mon Jan 12 05:40:27 2004
@@ -93,15 +93,6 @@
     acquireCriteria = 1
     _criteriaTypes = []
 
-    # Contentish interface methods
-    # ----------------------------
-
-    security.declareProtected(View, 'icon')
-    def icon( self ):
-        """
-            For the ZMI.
-        """
-        return self.getIcon()
 
     security.declarePrivate( '_verifyActionPermissions' )
     def _verifyActionPermissions( self, action ):
@@ -267,14 +258,9 @@
         """
             Add a new subtopic.
         """
-        try:
-            tool = getToolByName( self, 'portal_types' )
-        except:
-            self._setOb( id, Topic( id ) )
-        else:
-            topictype = tool.getTypeInfo( self )
-            topictype.constructInstance( self, id )
-
+        ttool = getToolByName(self, 'portal_types')
+        ti = ttool.getTypeInfo('Topic')
+        ti.constructInstance(self, id)
         return self._getOb( id )
 
 # Intialize the Topic class, setting up security.