[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ Cleaned up / normalized imports:

[Tres Seaver]

Log message for revision 94393:
  Cleaned up / normalized imports:
  
  o Don't import from Globals;  instead, use real locations.
  
  o Make other imports use the actual source module, rather than an
    intermediate (e.g., prefer importing 'ClassSecurityInfo' from
    'AccessControl.SecurityInfo' rather than from 'AccessControl').
  
  o Avoid relative imports, which will break in later versions of Python.
  

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CalendarTool.py
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/Event.py
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/__init__.py
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/setuphandlers.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2008-12-27 21:58:47 UTC (rev 94392)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2008-12-27 22:02:51 UTC (rev 94393)
@@ -4,6 +4,16 @@
 2.2.0 (unreleased)
 ------------------
 
+- Cleaned up / normalized imports:
+
+  o Don't import from Globals;  instead, use real locations.
+
+  o Make other imports use the actual source module, rather than an
+    intermediate (e.g., prefer importing 'ClassSecurityInfo' from
+    'AccessControl.SecurityInfo' rather than from 'AccessControl').
+
+  o Avoid relative imports, which will break in later versions of Python.
+
 - profiles: Added an add view expression to the Event content type definition.
 
 - Fixed a bug were the last day of each month was missed.

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CalendarTool.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CalendarTool.py	2008-12-27 21:58:47 UTC (rev 94392)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CalendarTool.py	2008-12-27 22:02:51 UTC (rev 94393)
@@ -17,9 +17,9 @@
 
 import calendar
 
-from AccessControl import ClassSecurityInfo
-from DateTime import DateTime
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from DateTime.DateTime import DateTime
+from App.class_init import default__class_init__ as InitializeClass
 from OFS.SimpleItem import SimpleItem
 from zope.interface import implements
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -27,8 +27,8 @@
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import UniqueObject
 
-from interfaces import ICalendarTool
-from permissions import ManagePortal
+from Products.CMFCalendar.interfaces import ICalendarTool
+from Products.CMFCalendar.permissions import ManagePortal
 
 def sort_by_date(x, y):
     """ Utility function for sorting by start times, falling back on end times

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/Event.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/Event.py	2008-12-27 21:58:47 UTC (rev 94392)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/Event.py	2008-12-27 22:02:51 UTC (rev 94393)
@@ -15,10 +15,10 @@
 $Id$
 """
 
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from DateTime.DateTime import DateTime
 import transaction
-from AccessControl import ClassSecurityInfo
-from DateTime import DateTime
-from Globals import InitializeClass
 from zope.component.factory import Factory
 from zope.interface import implements
 
@@ -33,12 +33,12 @@
 from Products.CMFDefault.utils import SimpleHTMLParser
 from Products.GenericSetup.interfaces import IDAVAware
 
-from exceptions import ResourceLockedError
-from interfaces import IEvent
-from interfaces import IMutableEvent
-from permissions import ChangeEvents
-from permissions import ModifyPortalContent
-from permissions import View
+from Products.CMFCalendar.exceptions import ResourceLockedError
+from Products.CMFCalendar.interfaces import IEvent
+from Products.CMFCalendar.interfaces import IMutableEvent
+from Products.CMFCalendar.permissions import ChangeEvents
+from Products.CMFCalendar.permissions import ModifyPortalContent
+from Products.CMFCalendar.permissions import View
 
 
 def addEvent( self

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/__init__.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/__init__.py	2008-12-27 21:58:47 UTC (rev 94392)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/__init__.py	2008-12-27 22:02:51 UTC (rev 94393)
@@ -15,18 +15,18 @@
 $Id$
 """
 
-from Products.CMFCore.utils import ContentInit
-from Products.CMFCore.utils import ToolInit
+def initialize(context):
 
-import Event
-import CalendarTool
-from permissions import AddPortalContent
+    from Products.CMFCore.utils import ContentInit
+    from Products.CMFCore.utils import ToolInit
 
+    import Event
+    import CalendarTool
+    from permissions import AddPortalContent
 
-# Make sure security is initialized
-import utils
 
-def initialize(context):
+    # Make sure security is initialized
+    import utils
 
     ToolInit( 'CMF Calendar Tool'
             , tools=(CalendarTool.CalendarTool,)

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/setuphandlers.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/setuphandlers.py	2008-12-27 21:58:47 UTC (rev 94392)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/setuphandlers.py	2008-12-27 22:02:51 UTC (rev 94393)
@@ -19,7 +19,7 @@
 
 from Products.CMFCore.interfaces import IMetadataTool
 
-from exceptions import MetadataError
+from Products.CMFCalendar.exceptions import MetadataError
 
 
 def importVarious(context):