[CMF-checkins] CVS: CMF/CMFDefault/skins/content - document_edit.py:1.8 metadata_edit.py:1.7 newsitem_edit.py:1.8

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault/skins/content
In directory cvs.zope.org:/tmp/cvs-serv25166/CMFDefault/skins/content

Modified Files:
	document_edit.py metadata_edit.py newsitem_edit.py 
Log Message:
 - Merge tseaver-permissiongeddon-branch.


=== CMF/CMFDefault/skins/content/document_edit.py 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/content/document_edit.py:1.7	Wed Jan  7 11:31:47 2004
+++ CMF/CMFDefault/skins/content/document_edit.py	Thu Apr 29 12:13:18 2004
@@ -2,11 +2,11 @@
 ##parameters=text_format, text, file='', SafetyBelt='', change_and_view=''
 ##title=Edit a document
 ##
-from Products.CMFCore.CMFCoreExceptions import EditingConflict
-from Products.CMFCore.CMFCoreExceptions import IllegalHTML
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
-from Products.CMFDefault.utils import scrubHTML
 from Products.PythonScripts.standard import urlencode
+from Products.CMFDefault.exceptions import EditingConflict
+from Products.CMFDefault.exceptions import IllegalHTML
+from Products.CMFDefault.exceptions import ResourceLockedError
+from Products.CMFDefault.utils import scrubHTML
 
 try:
     text = scrubHTML( text ) # Strip Javascript, etc.


=== CMF/CMFDefault/skins/content/metadata_edit.py 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/content/metadata_edit.py:1.6	Wed Jan  7 11:31:47 2004
+++ CMF/CMFDefault/skins/content/metadata_edit.py	Thu Apr 29 12:13:18 2004
@@ -2,9 +2,10 @@
 ##parameters=allowDiscussion=None, title=None, subject=None, description=None, contributors=None, effective_date=None, expiration_date=None, format=None, language=None, rights=None, change_and_edit='', change_and_view=''
 ##title=Update Content Metadata
 ##
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
-from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.standard import urlencode
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDefault.exceptions import ResourceLockedError
+
 dtool = getToolByName(script, 'portal_discussion')
 
 def tuplify( value ):


=== CMF/CMFDefault/skins/content/newsitem_edit.py 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/content/newsitem_edit.py:1.7	Wed Jan  7 11:31:47 2004
+++ CMF/CMFDefault/skins/content/newsitem_edit.py	Thu Apr 29 12:13:18 2004
@@ -2,10 +2,10 @@
 ##parameters=text, description, text_format=None, change_and_view=''
 ##title=Edit a news item
 ##
-from Products.CMFCore.CMFCoreExceptions import IllegalHTML
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
-from Products.CMFDefault.utils import scrubHTML
 from Products.PythonScripts.standard import urlencode
+from Products.CMFDefault.exceptions import IllegalHTML
+from Products.CMFDefault.exceptions import ResourceLockedError
+from Products.CMFDefault.utils import scrubHTML
 
 try:
     text = scrubHTML( text ) # Strip Javascript, etc.