[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - removed the five.localsitemanager svn:external and its import hack

[Jens Vagelpohl]

Log message for revision 84904:
  - removed the five.localsitemanager svn:external and its import hack
    in favor of stating the dependency for separate installation in
    DEPENDENCIES.txt and automatic installation in setup.py.
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/__init__.py
  D   Products.CMFCore/trunk/Products/CMFCore/src/

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-03-24 13:18:37 UTC (rev 84903)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-03-24 13:23:57 UTC (rev 84904)
@@ -2,6 +2,10 @@
 
   Products.CMFCore 2.2.0 (unreleased)
 
+    - removed the five.localsitemanager svn:external and its import hack
+      in favor of stating the dependency for separate installation in
+      DEPENDENCIES.txt and automatic installation in setup.py.
+
     - TypesTool: Refactored content creation.
       Moved notifyWorkflowCreated and indexObject calls to IObjectAddedEvent
       handler. Please make sure all oldstyle content factory methods use

Modified: Products.CMFCore/trunk/Products/CMFCore/__init__.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/__init__.py	2008-03-24 13:18:37 UTC (rev 84903)
+++ Products.CMFCore/trunk/Products/CMFCore/__init__.py	2008-03-24 13:23:57 UTC (rev 84904)
@@ -15,14 +15,6 @@
 $Id$
 """
 
-try:
-    import five.localsitemanager
-except ImportError, e:
-    import sys
-    import os
-    sys.path.append(os.path.join(os.path.dirname(__file__), 'src'))
-    import five.localsitemanager
-
 import PortalFolder
 import MembershipTool, WorkflowTool, CatalogTool, DiscussionTool
 import ActionsTool, UndoTool, RegistrationTool, SkinsTool