merge r107525-107528 from Zope 2.10

doc/CHANGES.rst

@@ -11,6 +11,10 @@ Zope 2.12.3 (unreleased)
 Bugs Fixed
 ++++++++++
 
+- Also look for ZEXP imports within the clienthome directory. This
+  provides a place to put imports that won't be clobbered by buildout
+  in a buildout-based Zope instance.
+
 - Fixed a SyntaxError in utilities/load_site.py script.
 
 Features Added

src/OFS/ObjectManager.py

@@ -617,7 +617,6 @@ class ObjectManager(CopyContainer,
         if dirname:
             raise BadRequest, 'Invalid file name %s' % escape(file)
 
-        cfg = getConfiguration()
         for impath in self._getImportPaths():
             filepath = os.path.join(impath, 'import', file)
             if os.path.exists(filepath):
@@ -663,6 +662,8 @@ class ObjectManager(CopyContainer,
             paths.append(zopehome)
         if not cfg.instancehome in paths:
             paths.append(cfg.instancehome)
+        if not cfg.clienthome in paths:
+            paths.append(cfg.clienthome)
         return paths
 
     def list_imports(self):