[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.176.2.1

Amos Latteier amos@zope.com
Tue, 18 Dec 2001 13:12:47 -0500


Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv13164/lib/python/OFS

Modified Files:
      Tag: Zope-2_5-branch
	Application.py 
Log Message:
Merged Example fixes to Zope 2.5 branch.


=== Zope/lib/python/OFS/Application.py 1.176 => 1.176.2.1 ===
     if not hasattr(app, 'Examples') and not \
        hasattr(app, '_Zope25_examples_have_been_added'):
-        examples_path = os.path.join(Globals.data_dir, 'Examples.zexp')
+        examples_path = os.path.join(Globals.INSTANCE_HOME, 'import', 'Examples.zexp')
         if os.path.isfile(examples_path):
             app._importObjectFromFile(examples_path, verify=0)
             app._Zope25_examples_have_been_added=1