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

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_6-branch
	Application.py 
Log Message:
Merge fix from Jamie Heilman for nonautomagical examples folder installation (collector 956).



=== Zope/lib/python/OFS/Application.py 1.188.4.2 => 1.188.4.3 ===
--- Zope/lib/python/OFS/Application.py:1.188.4.2	Sat May 17 10:55:21 2003
+++ Zope/lib/python/OFS/Application.py	Tue Jun 24 09:44:11 2003
@@ -369,26 +369,6 @@
         get_transaction().commit()
         del sdm
 
-    # Ensure that there's an Examples folder with examples.
-    # However, make sure that if the examples have been added already
-    # and then deleted that we don't add them again.
-
-
-    if not hasattr(app, 'Examples') and not \
-       hasattr(app, '_Zope25_examples_have_been_added'):
-
-        examples_path = os.path.join(Globals.ZOPE_HOME, \
-             'import', 'Examples.zexp')
-
-        if os.path.isfile(examples_path):
-            app._importObjectFromFile(examples_path, verify=0)
-            app._Zope25_examples_have_been_added=1
-            get_transaction().note('Added Examples folder')
-            get_transaction().commit()
-        else:
-            LOG('Zope Default Object Creation', INFO,
-                '%s examples import file could not be found.' % examples_path)
-
     # b/c: Ensure that Owner role exists.
     if hasattr(app, '__ac_roles__') and not ('Owner' in app.__ac_roles__):
         app.__ac_roles__=app.__ac_roles__ + ('Owner',)