Commit a88ce090 authored by 's avatar

reverted r65904:

- I still believe this was the Right Thing to do, but not everybody agrees
parent a8b7b184
...@@ -89,9 +89,6 @@ def checkValidId(self, id, allow_dup=0): ...@@ -89,9 +89,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:
......
...@@ -378,7 +378,6 @@ class ObjectManagerTests(PlacelessSetup, unittest.TestCase): ...@@ -378,7 +378,6 @@ class ObjectManagerTests(PlacelessSetup, 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_list_imports(self): def test_list_imports(self):
om = self._makeOne() om = self._makeOne()
...@@ -390,7 +389,6 @@ class ObjectManagerTests(PlacelessSetup, unittest.TestCase): ...@@ -390,7 +389,6 @@ class ObjectManagerTests(PlacelessSetup, unittest.TestCase):
self.failUnless(filename.endswith('.zexp') or self.failUnless(filename.endswith('.zexp') or
filename.endswith('.xml')) filename.endswith('.xml'))
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite( ObjectManagerTests ) ) suite.addTest( unittest.makeSuite( ObjectManagerTests ) )
......
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