[CMF-checkins] CVS: CMF/CMFCore - __init__.py:1.14

[Tres Seaver]

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

Modified Files:
	__init__.py 
Log Message:
 - Merge fix for Tracker #430.

=== CMF/CMFCore/__init__.py 1.13 => 1.14 ===
 import ContentTypeRegistry
 import utils
-import FSPageTemplate
+
+try:
+    import FSPageTemplate
+except ImportError:
+    HAS_PAGE_TEMPLATES = 0
+else:
+    HAS_PAGE_TEMPLATES = 1
+
 
 ADD_FOLDERS_PERMISSION = 'Add portal folders'
 
@@ -87,8 +94,9 @@
         icon = 'images/registry.gif'
         )
 
-    utils.registerIcon(FSPageTemplate.FSPageTemplate,
-                      'images/fspt.gif', globals())
+    if HAS_PAGE_TEMPLATES:
+        utils.registerIcon(FSPageTemplate.FSPageTemplate,
+                        'images/fspt.gif', globals())
     utils.registerIcon(FSDTMLMethod.FSDTMLMethod,
                        'images/fsdtml.gif', globals())
     utils.registerIcon(FSPythonScript.FSPythonScript,