[CMF-checkins] CVS: CMF/CMFSetup - registry.py:1.7

[Tres Seaver]

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

Modified Files:
	registry.py 
Log Message:
 - _getDottedName handles the special case now.


=== CMF/CMFSetup/registry.py 1.6 => 1.7 ===
--- CMF/CMFSetup/registry.py:1.6	Fri May 14 09:22:43 2004
+++ CMF/CMFSetup/registry.py	Fri May 14 09:28:52 2004
@@ -3,7 +3,6 @@
 $Id$
 """
 import re
-from types import StringTypes
 from xml.sax import parseString
 from xml.sax.handler import ContentHandler
 
@@ -191,12 +190,9 @@
             title = title or t
             description = description or d
 
-        if type( handler ) not in StringTypes:
-            handler = _getDottedName( handler )
-
         info = { 'id'           : id
                , 'version'      : version
-               , 'handler'      : handler
+               , 'handler'      : _getDottedName( handler )
                , 'dependencies' : dependencies
                , 'title'        : title
                , 'description'  : description
@@ -458,11 +454,8 @@
             title = title or t
             description = description or d
 
-        if type( handler ) not in StringTypes:
-            handler = _getDottedName( handler )
-
         info = { 'id'           : id
-               , 'handler'      : handler
+               , 'handler'      : _getDottedName( handler )
                , 'title'        : title
                , 'description'  : description
                }