[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/ reverted r65904:

[Yvo Schubbe]

Log message for revision 66024:
  reverted r65904:
  - I still believe this was the Right Thing to do, but not everybody agrees

Changed:
  U   Zope/trunk/lib/python/OFS/ObjectManager.py
  U   Zope/trunk/lib/python/OFS/tests/testObjectManager.py

-=-
Modified: Zope/trunk/lib/python/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/lib/python/OFS/ObjectManager.py	2006-03-15 08:17:11 UTC (rev 66023)
+++ Zope/trunk/lib/python/OFS/ObjectManager.py	2006-03-15 08:17:25 UTC (rev 66024)
@@ -89,9 +89,6 @@
         'The id "%s" is invalid because it begins with "aq_".' % id)
     if id.endswith('__'): raise BadRequest, (
         '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:
         obj = getattr(self, id, None)
         if obj is not None:

Modified: Zope/trunk/lib/python/OFS/tests/testObjectManager.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testObjectManager.py	2006-03-15 08:17:11 UTC (rev 66023)
+++ Zope/trunk/lib/python/OFS/tests/testObjectManager.py	2006-03-15 08:17:25 UTC (rev 66024)
@@ -378,7 +378,6 @@
         self.assertRaises(BadRequest, om._setObject, '111', si)
         self.assertRaises(BadRequest, om._setObject, 'REQUEST', si)
         self.assertRaises(BadRequest, om._setObject, '/', si)
-        self.assertRaises(BadRequest, om._setObject, '@@view', si)
 
     def test_list_imports(self):
         om = self._makeOne()
@@ -390,7 +389,6 @@
             self.failUnless(filename.endswith('.zexp') or
                             filename.endswith('.xml'))
 
-
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest( unittest.makeSuite( ObjectManagerTests ) )