[Checkins] SVN: cmf.pt/trunk/ Avoid a deprecation warning for Globals.InitializeClass. Reformat changelog!

[Hanno Schlichting]

Log message for revision 98288:
  Avoid a deprecation warning for Globals.InitializeClass. Reformat changelog!
  

Changed:
  U   cmf.pt/trunk/CHANGES.txt
  U   cmf.pt/trunk/setup.py
  U   cmf.pt/trunk/src/cmf/pt/fs.py

-=-
Modified: cmf.pt/trunk/CHANGES.txt
===================================================================
--- cmf.pt/trunk/CHANGES.txt	2009-03-20 14:59:07 UTC (rev 98287)
+++ cmf.pt/trunk/CHANGES.txt	2009-03-20 19:16:22 UTC (rev 98288)
@@ -1,18 +1,24 @@
 Changelog
 =========
 
-cmf.pt 0.3 (released 2/13/2009)
+0.4 - unreleased
+----------------
 
- - Added ``_exec`` method to the file-system based skin template
-   class, largely carried over from
-   ``Products.PageTemplates``. [malthe]
+- Avoid a deprecation warning for Globals.InitializeClass. [hannosch]
 
-cmf.pt 0.2 (released 12/17/2008)
+0.3 - 2009-02-13
+----------------
 
- - The ``func_code`` attribute of file-system page templates should
-   simulate a function taking no arguments.
- 
-cmf.pt 0.1 (released 11/29/2008)
+- Added ``_exec`` method to the file-system based skin template class, largely
+  carried over from `Products.PageTemplates`. [malthe]
 
- - Initial release.
+0.2 - 2008-12-17
+----------------
 
+- The ``func_code`` attribute of file-system page templates should simulate a
+  function taking no arguments. [malthe]
+
+0.1 - 2008-11-29
+----------------
+
+- Initial release. [malthe]

Modified: cmf.pt/trunk/setup.py
===================================================================
--- cmf.pt/trunk/setup.py	2009-03-20 14:59:07 UTC (rev 98287)
+++ cmf.pt/trunk/setup.py	2009-03-20 19:16:22 UTC (rev 98288)
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3'
+version = '0.4'
 
 setup(name='cmf.pt',
       version=version,
@@ -11,7 +11,6 @@
         "Programming Language :: Python",
         "Topic :: Text Processing :: Markup :: HTML",
         "Topic :: Text Processing :: Markup :: XML",
-        "Topic :: Software Development :: Libraries :: Python Modules",
         ],
       keywords='',
       author='Malthe Borch and the Zope community',

Modified: cmf.pt/trunk/src/cmf/pt/fs.py
===================================================================
--- cmf.pt/trunk/src/cmf/pt/fs.py	2009-03-20 14:59:07 UTC (rev 98287)
+++ cmf.pt/trunk/src/cmf/pt/fs.py	2009-03-20 19:16:22 UTC (rev 98288)
@@ -1,4 +1,8 @@
-import Globals
+# BBB for Zope 2.10
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    from Globals import InitializeClass
 
 from Products.CMFCore.FSObject import FSObject
 from Products.CMFCore import DirectoryView
@@ -81,8 +85,8 @@
     def __call__(self, *args, **kwargs):
         return self._call(FSPageTemplate.__call__, *args, **kwargs)
 
-Globals.InitializeClass(FSPageTemplate)
-Globals.InitializeClass(FSControllerPageTemplate)
+InitializeClass(FSPageTemplate)
+InitializeClass(FSControllerPageTemplate)
 
 DirectoryView.registerFileExtension('pt', FSPageTemplate)
 DirectoryView.registerFileExtension('zpt', FSPageTemplate)