[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - forward ported r116641 and r116642
Yvo Schubbe
cvs-admin at zope.org
Tue Apr 3 07:50:23 UTC 2012
Log message for revision 124908:
- forward ported r116641 and r116642
Changed:
U Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py
U Products.CMFCore/trunk/Products/CMFCore/utils.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py 2012-04-03 05:58:40 UTC (rev 124907)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_utils.py 2012-04-03 07:50:19 UTC (rev 124908)
@@ -97,6 +97,17 @@
self.assertEqual(getContainingPackage('zope.interface.verify'),
'zope.interface')
+ def test_ImmutableId(self):
+ from Products.CMFCore.utils import ImmutableId
+
+ class Foo(ImmutableId):
+ def getId(self):
+ return 'foo'
+
+ foo = Foo()
+ foo._setId('foo')
+ self.assertRaises(ValueError, foo._setId, 'bar')
+
def test__OldCacheHeaders(self):
from Products.CMFCore.utils import _OldCacheHeaders
Modified: Products.CMFCore/trunk/Products/CMFCore/utils.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/utils.py 2012-04-03 05:58:40 UTC (rev 124907)
+++ Products.CMFCore/trunk/Products/CMFCore/utils.py 2012-04-03 07:50:19 UTC (rev 124908)
@@ -33,7 +33,6 @@
from App.class_init import InitializeClass
from App.Common import package_home
from App.Common import rfc1123_date
-from App.Dialogs import MessageDialog
from App.ImageFile import ImageFile
from App.special_dtml import HTMLFile
from DateTime.DateTime import DateTime
@@ -502,10 +501,8 @@
""" Never allow renaming!
"""
if id != self.getId():
- raise ValueError(MessageDialog(
- title='Invalid Id',
- message='Cannot change the id of this object',
- action='./manage_main'))
+ raise ValueError('Changing the id of this object is forbidden: %s'
+ % self.getId())
class UniqueObject (ImmutableId):
More information about the checkins
mailing list