Commit 363c6010 authored by 's avatar

reverted r65902:

- I still believe this was the Right Thing to do, but not everybody agrees
parent 0710e777
...@@ -18,9 +18,6 @@ Zope Changes ...@@ -18,9 +18,6 @@ Zope Changes
Bugs fixed Bugs fixed
- OFS ObjectManager: Fixed 'checkValidId'.
Names starting with '@' are reserved for views and not allowed in IDs.
- Collector #2039: 'ZPublisher.HTTPRequest.HTTPRequest._authUserPW' - Collector #2039: 'ZPublisher.HTTPRequest.HTTPRequest._authUserPW'
choked on passwords which contained colons. choked on passwords which contained colons.
......
...@@ -72,9 +72,6 @@ def checkValidId(self, id, allow_dup=0): ...@@ -72,9 +72,6 @@ def checkValidId(self, id, allow_dup=0):
'The id "%s" is invalid because it begins with "aq_".' % id) 'The id "%s" is invalid because it begins with "aq_".' % id)
if id.endswith('__'): raise BadRequest, ( if id.endswith('__'): raise BadRequest, (
'The id "%s" is invalid because it ends with two underscores.' % id) 'The id "%s" is invalid because it ends with two underscores.' % id)
if id[0] == '@':
raise BadRequest('The id "%s" is invalid because it begins with '
'"@".' % id)
if not allow_dup: if not allow_dup:
obj = getattr(self, id, None) obj = getattr(self, id, None)
if obj is not None: if obj is not None:
......
...@@ -354,8 +354,6 @@ class ObjectManagerTests( unittest.TestCase ): ...@@ -354,8 +354,6 @@ class ObjectManagerTests( unittest.TestCase ):
self.assertRaises(BadRequest, om._setObject, '111', si) self.assertRaises(BadRequest, om._setObject, '111', si)
self.assertRaises(BadRequest, om._setObject, 'REQUEST', si) self.assertRaises(BadRequest, om._setObject, 'REQUEST', si)
self.assertRaises(BadRequest, om._setObject, '/', si) self.assertRaises(BadRequest, om._setObject, '/', si)
self.assertRaises(BadRequest, om._setObject, '@@view', si)
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment