Merge pull request #85 from plone/dxcontainer-siteroot

Dx container site root

CHANGES.rst

@@ -46,7 +46,7 @@ Bug fixes:
 
 
 - Fixes test to work clean with zope.interface.
-  Interfaces are hashed based on just their name and module. 
+  Interfaces are hashed based on just their name and module.
   So every one of these local `IBlank` interfaces will hash the same way, and be treated the same for purposes of zope.interface's `_dependents`.
   Thus in tests mock interfaces must not be used under the same name in the same module.
   [jensens] (#135)

news/85.bugfix

@@ -0,0 +1,4 @@
+Fix ft._updateProperty so it doesn't break when receiving an empty value.
+This happens when an DX FTI is part of a Generic Setup baseline import.
+Update more code to work when the Plone Site is a dexterity item.
+[jaroel]

plone/dexterity/content.py

@@ -50,6 +50,7 @@
 from zope.security.interfaces import IPermission
 
 import six
+import warnings
 import threading
 
 
@@ -766,7 +767,10 @@ def __getattr__(self, name):
             pass
 
         # Be specific about the implementation we use
-        return CMFOrderedBTreeFolderBase.__getattr__(self, name)
+        if self._tree is not None:
+            return CMFOrderedBTreeFolderBase.__getattr__(self, name)
+
+        raise AttributeError(name)
 
     @security.protected(permissions.DeleteObjects)
     def manage_delObjects(self, ids=None, REQUEST=None):

plone/dexterity/factory.py

@@ -29,7 +29,7 @@ def description(self):
     def __call__(self, *args, **kw):
         fti = getUtility(IDexterityFTI, name=self.portal_type)
 
-        klass = resolveDottedName(fti.klass)
+        klass = resolveDottedName(fti.klass) if fti.klass else None
         if klass is None or not callable(klass):
             raise ValueError(
                 "Content class %s set for type %s is not valid"

plone/dexterity/fti.py

@@ -190,7 +190,7 @@ def __init__(self, *args, **kwargs):
 
         # Set the content_meta_type from the klass
 
-        klass = utils.resolveDottedName(self.klass)
+        klass = utils.resolveDottedName(self.klass) if self.klass else None
         if klass is not None:
             self.content_meta_type = getattr(klass, "meta_type", None)
 
@@ -228,7 +228,7 @@ def Metatype(self):
         if self.content_meta_type:
             return self.content_meta_type
         # BBB - this didn't use to be set
-        klass = utils.resolveDottedName(self.klass)
+        klass = utils.resolveDottedName(self.klass) if self.klass else None
         if klass is not None:
             self.content_meta_type = getattr(klass, "meta_type", None)
         return self.content_meta_type
@@ -301,7 +301,9 @@ def _updateProperty(self, id, value):
 
             # Update meta_type from klass
             if id == "klass":
-                klass = utils.resolveDottedName(new_value)
+                klass = None
+                if new_value:
+                    klass = utils.resolveDottedName(new_value)
                 if klass is not None:
                     self.content_meta_type = getattr(klass, "meta_type", None)
 

plone/dexterity/schema.py

@@ -16,6 +16,7 @@
 from zope.component import getAllUtilitiesRegisteredFor
 from zope.component import getUtility
 from zope.component import queryUtility
+from zope.component.hooks import getSite
 from zope.dottedname.resolve import resolve
 from zope.globalrequest import getRequest
 from zope.interface import alsoProvides
@@ -65,9 +66,11 @@ def lookup_fti(portal_type, cache=True):
                 if fti_cache is None:
                     fti_cache = dict()
                     setattr(request, FTI_CACHE_KEY, fti_cache)
+                fti = None
                 if portal_type in fti_cache:
                     fti = fti_cache[portal_type]
-                else:
+
+                if fti is None:
                     fti_cache[portal_type] = fti = queryUtility(
                         IDexterityFTI, name=portal_type
                     )
@@ -321,7 +324,14 @@ def split(self, s):
 def portalTypeToSchemaName(portal_type, schema=u"", prefix=None, suffix=None):
     """Return a canonical interface name for a generated schema interface."""
     if prefix is None:
-        prefix = "/".join(getUtility(ISiteRoot).getPhysicalPath())[1:]
+        siteroot = None
+        if portal_type == "Plone Site":
+            fti = queryUtility(IDexterityFTI, name=portal_type)
+            if fti is not None:
+                siteroot = fti.__parent__
+        if siteroot is None:
+            siteroot = getUtility(ISiteRoot)
+        prefix = "/".join(siteroot.getPhysicalPath())[1:]
     if suffix:
         prefix = "|".join([prefix, suffix])