Log message for revision 107529: merge r107525-107528 from Zope 2.10 Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/OFS/ObjectManager.py
-=- Modified: Zope/branches/2.12/doc/CHANGES.rst =================================================================== --- Zope/branches/2.12/doc/CHANGES.rst 2010-01-02 03:39:16 UTC (rev 107528) +++ Zope/branches/2.12/doc/CHANGES.rst 2010-01-02 03:43:32 UTC (rev 107529) @@ -11,6 +11,10 @@ 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 Modified: Zope/branches/2.12/src/OFS/ObjectManager.py =================================================================== --- Zope/branches/2.12/src/OFS/ObjectManager.py 2010-01-02 03:39:16 UTC (rev 107528) +++ Zope/branches/2.12/src/OFS/ObjectManager.py 2010-01-02 03:43:32 UTC (rev 107529) @@ -617,7 +617,6 @@ 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 @@ 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): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins