Commit e957ad47 authored by David Glick's avatar David Glick

merge r107525-107528 from Zope 2.10

parent 33a40e24
...@@ -11,6 +11,10 @@ Zope 2.12.3 (unreleased) ...@@ -11,6 +11,10 @@ Zope 2.12.3 (unreleased)
Bugs Fixed 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. - Fixed a SyntaxError in utilities/load_site.py script.
Features Added Features Added
......
...@@ -617,7 +617,6 @@ class ObjectManager(CopyContainer, ...@@ -617,7 +617,6 @@ class ObjectManager(CopyContainer,
if dirname: if dirname:
raise BadRequest, 'Invalid file name %s' % escape(file) raise BadRequest, 'Invalid file name %s' % escape(file)
cfg = getConfiguration()
for impath in self._getImportPaths(): for impath in self._getImportPaths():
filepath = os.path.join(impath, 'import', file) filepath = os.path.join(impath, 'import', file)
if os.path.exists(filepath): if os.path.exists(filepath):
...@@ -663,6 +662,8 @@ class ObjectManager(CopyContainer, ...@@ -663,6 +662,8 @@ class ObjectManager(CopyContainer,
paths.append(zopehome) paths.append(zopehome)
if not cfg.instancehome in paths: if not cfg.instancehome in paths:
paths.append(cfg.instancehome) paths.append(cfg.instancehome)
if not cfg.clienthome in paths:
paths.append(cfg.clienthome)
return paths return paths
def list_imports(self): def list_imports(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment