[Checkins] SVN: Products.ExternalEditor/trunk/ clean up imports from Globals

David Glick davidglick at onenw.org
Sun Aug 23 21:12:28 EDT 2009


Log message for revision 103122:
  clean up imports from Globals

Changed:
  U   Products.ExternalEditor/trunk/CHANGES.txt
  U   Products.ExternalEditor/trunk/Products/ExternalEditor/ExternalEditor.py
  U   Products.ExternalEditor/trunk/Products/ExternalEditor/__init__.py

-=-
Modified: Products.ExternalEditor/trunk/CHANGES.txt
===================================================================
--- Products.ExternalEditor/trunk/CHANGES.txt	2009-08-24 00:42:25 UTC (rev 103121)
+++ Products.ExternalEditor/trunk/CHANGES.txt	2009-08-24 01:12:27 UTC (rev 103122)
@@ -4,8 +4,11 @@
 Unreleased - 1.0a2
 ------------------
 
+  - Removed imports from Globals.
+
   - Purged old Zope 2 Interface interfaces for Zope 2.12 compatibility.
 
+
 5/3/2008 - 1.0a1
 ----------------
 

Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/ExternalEditor.py
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/ExternalEditor.py	2009-08-24 00:42:25 UTC (rev 103121)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/ExternalEditor.py	2009-08-24 01:12:27 UTC (rev 103122)
@@ -21,7 +21,10 @@
 import re
 import urllib
 import Acquisition
-from Globals import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    from App.class_init import default__class_init__ as InitializeClass
 from App.Common import rfc1123_date
 from AccessControl.SecurityManagement import getSecurityManager
 from AccessControl.SecurityInfo import ClassSecurityInfo

Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/__init__.py
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/__init__.py	2009-08-24 00:42:25 UTC (rev 103121)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/__init__.py	2009-08-24 01:12:27 UTC (rev 103122)
@@ -14,7 +14,8 @@
 
 # Zope External Editor Product by Casey Duncan
 
-from Globals import ImageFile, DTMLFile
+from App.ImageFile import ImageFile
+from App.special_dtml import DTMLFile
 from OFS.ObjectManager import ObjectManager
 from OFS.FindSupport import FindSupport
 from OFS.Folder import Folder



More information about the Checkins mailing list