[CMF-checkins] CVS: CMF/CMFCore - TypesTool.py:1.37.4.7

[Shane Hathaway]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv17216

Modified Files:
      Tag: CMF-1_3-branch
	TypesTool.py 
Log Message:
Merge from trunk


=== CMF/CMFCore/TypesTool.py 1.37.4.6 => 1.37.4.7 ===
         if type( contentType ) is not type( '' ):
             if hasattr(aq_base(contentType), '_getPortalTypeName'):
                 contentType = contentType._getPortalTypeName()
+                if contentType is None:
+                    return None
             else:
                 return None
         ob = getattr( self, contentType, None )