[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/ I hate unclean checkouts...

[Wichert Akkerman]

Log message for revision 76741:
  I hate unclean checkouts...

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	2007-06-17 18:16:23 UTC (rev 76740)
+++ Zope/trunk/lib/python/OFS/ObjectManager.py	2007-06-17 18:20:41 UTC (rev 76741)
@@ -705,7 +705,6 @@
                 out=out+((k,stat),)
         return marshal.dumps(out)
 
-    security.declareProtected(access_contents_information, 'manage_hasId')
     def manage_hasId(self, REQUEST):
         """ check if the folder has an object with REQUEST['id'] """
 

Modified: Zope/trunk/lib/python/OFS/tests/testObjectManager.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testObjectManager.py	2007-06-17 18:16:23 UTC (rev 76740)
+++ Zope/trunk/lib/python/OFS/tests/testObjectManager.py	2007-06-17 18:20:41 UTC (rev 76741)
@@ -411,16 +411,6 @@
             self.failUnless(filename.endswith('.zexp') or
                             filename.endswith('.xml'))
 
-    def test_hasId(self):
-        om = self._makeOne()
-        request={'id' : 'test'}
-        self.assertRaises(KeyError, om.manage_hasId, request)
-
-        si = SimpleItem('test')
-        om._setObject('test', si)
-        om.manage_hasId(request)
-
-
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest( unittest.makeSuite( ObjectManagerTests ) )