[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - document_edit_control.py:1.3 newsitem_edit_control.py:1.3

[Tres Seaver]

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

Modified Files:
	document_edit_control.py newsitem_edit_control.py 
Log Message:
 - Merge tseaver-permissiongeddon-branch.


=== CMF/CMFDefault/skins/zpt_content/document_edit_control.py 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_content/document_edit_control.py:1.2	Thu Feb  5 09:45:37 2004
+++ CMF/CMFDefault/skins/zpt_content/document_edit_control.py	Thu Apr 29 12:13:19 2004
@@ -8,10 +8,11 @@
 ##title=
 ##
 from ZTUtils import make_query
-from Products.CMFCore.CMFCoreExceptions import EditingConflict
-from Products.CMFCore.CMFCoreExceptions import IllegalHTML
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
+from Products.CMFDefault.exceptions import EditingConflict
+from Products.CMFDefault.exceptions import IllegalHTML
+from Products.CMFDefault.exceptions import ResourceLockedError
 from Products.CMFDefault.utils import scrubHTML
+
 message = ''
 
 


=== CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py:1.2	Thu Feb  5 09:45:37 2004
+++ CMF/CMFDefault/skins/zpt_content/newsitem_edit_control.py	Thu Apr 29 12:13:19 2004
@@ -8,9 +8,10 @@
 ##title=
 ##
 from ZTUtils import make_query
-from Products.CMFCore.CMFCoreExceptions import IllegalHTML
-from Products.CMFCore.CMFCoreExceptions import ResourceLockedError
+from Products.CMFDefault.exceptions import IllegalHTML
+from Products.CMFDefault.exceptions import ResourceLockedError
 from Products.CMFDefault.utils import scrubHTML
+
 message = ''