don't break if portal_factory is missing

CHANGES.rst

@@ -4,6 +4,9 @@ Changelog
 2.5a2 (unreleased)
 ------------------
 
+- Don't break if portal_factory is missing.
+  [davisagli]
+
 - Don't show the ``New user?`` link in the Login portlet if there isn't
   a register URL available from portal_actions.
   [davidjb] 

plone/app/portlets/manager.py

@@ -51,8 +51,8 @@ def base_url(self):
 
     def can_manage_portlets(self):
         context = self._context()
-        ftool = getToolByName(context, 'portal_factory')
-        if ftool.isTemporary(context) or \
+        ftool = getToolByName(context, 'portal_factory', None)
+        if ftool and ftool.isTemporary(context) or \
             not ILocalPortletAssignable.providedBy(context):
             return False
         mtool = getToolByName(context, 'portal_membership')

plone/app/portlets/tests/test_navigation_portlet.py

@@ -302,14 +302,6 @@ def testMultipleTopLevelWithNavigationRoot(self):
         self.assertEqual(len(tree2['children']), 1)
         self.assertEqual(len(tree1['children']), 1)
 
-    def testTopLevelWithPortalFactory(self):
-        id=self.portal.generateUniqueId('Document')
-        typeName='Document'
-        newObject=self.portal.folder1.restrictedTraverse('portal_factory/' + typeName + '/' + id)
-        # Will raise a KeyError unless bug is fixed
-        view = self.renderer(newObject, assignment=navigation.Assignment(topLevel=1))
-        view.getNavTree()
-
     def testShowAllParentsOverridesBottomLevel(self):
         view = self.renderer(self.portal.folder2.file21, assignment=navigation.Assignment(bottomLevel=1, topLevel=0))
         tree = view.getNavTree()