[z3-checkins] r10392 - z3/CMFonFive/trunk

[tseaver at codespeak.net]

Author: tseaver
Date: Thu Apr  7 04:14:22 2005
New Revision: 10392

Added:
   z3/CMFonFive/trunk/permissions.py
Modified:
   z3/CMFonFive/trunk/CHANGES.txt
   z3/CMFonFive/trunk/browser.py
   z3/CMFonFive/trunk/version.txt
Log:
Use newer permission imports from CMF 1.5, if available.

Modified: z3/CMFonFive/trunk/CHANGES.txt
==============================================================================
--- z3/CMFonFive/trunk/CHANGES.txt	(original)
+++ z3/CMFonFive/trunk/CHANGES.txt	Thu Apr  7 04:14:22 2005
@@ -1,6 +1,10 @@
-CMFonFive changes
+CMFonFive Product Changelog
 
+  After CMFonFive 1.0.0
+
+    - permissions.py:  Use newer permission imports from CMF 1.5,
+      if available (fall back to 1.4 spellings).
 
   CMFonFive 1.0.0 (2005/04/01)
 
-    Initial release.
\ No newline at end of file
+    - Initial release.

Modified: z3/CMFonFive/trunk/browser.py
==============================================================================
--- z3/CMFonFive/trunk/browser.py	(original)
+++ z3/CMFonFive/trunk/browser.py	Thu Apr  7 04:14:22 2005
@@ -14,13 +14,14 @@
 from Acquisition import Acquired
 from ZODB.POSException import ConflictError
 
-from Products.CMFCore.CMFCorePermissions import ListFolderContents
-from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
-from Products.CMFCore.CMFCorePermissions import View
 from Products.CMFDefault.utils import scrubHTML
 from Products.Five import BrowserView
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
+from Products.CMFonFive.permissions import ListFolderContents
+from Products.CMFonFive.permissions import ModifyPortalContent
+from Products.CMFonFive.permissions import View
+
 class PortalFolderView(BrowserView):
 
     getPhysicalPath = Acquired

Added: z3/CMFonFive/trunk/permissions.py
==============================================================================
--- (empty file)
+++ z3/CMFonFive/trunk/permissions.py	Thu Apr  7 04:14:22 2005
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2005 CMFonFive Contributors. All rights reserved.
+#
+# This software is distributed under the terms of the Zope Public
+# License (ZPL) v2.1. See COPYING.txt for more information.
+#
+###########################################################################
+""" CMFonFive product permissions
+
+$Id$
+"""
+
+try:
+    from Products.CMFCore.permissions import ListFolderContents
+    from Products.CMFCore.permissions import ModifyPortalContent
+    from Products.CMFCore.permissions import View
+except ImportError:  # CMF < 1.5.0
+    from Products.CMFCore.CMFCorePermissions import ListFolderContents
+    from Products.CMFCore.CMFCorePermissions import ModifyPortalContent
+    from Products.CMFCore.CMFCorePermissions import View
+

Modified: z3/CMFonFive/trunk/version.txt
==============================================================================
--- z3/CMFonFive/trunk/version.txt	(original)
+++ z3/CMFonFive/trunk/version.txt	Thu Apr  7 04:14:22 2005
@@ -1 +1 @@
-CMFonFive-1.0.0
+CMFonFive-1.0.0+