[Checkins] SVN: z3c.dav/trunk/src/z3c/dav/ Return a 200 status code if we try and remove a dead property that doesn't

[Michael Kerrin]

Log message for revision 75656:
  Return a 200 status code if we try and remove a dead property that doesn't
  exist.
  

Changed:
  U   z3c.dav/trunk/src/z3c/dav/proppatch.py
  U   z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py

-=-
Modified: z3c.dav/trunk/src/z3c/dav/proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/proppatch.py	2007-05-09 18:35:35 UTC (rev 75655)
+++ z3c.dav/trunk/src/z3c/dav/proppatch.py	2007-05-09 18:39:14 UTC (rev 75656)
@@ -153,10 +153,8 @@
         deadproperties = z3c.dav.interfaces.IOpaquePropertyStorage(
             self.context, None)
 
-        if deadproperties is None or not deadproperties.hasProperty(prop.tag):
-            raise z3c.dav.interfaces.ConflictError(
-                self.context, prop.tag, message = u"property doesn't exist")
+        if deadproperties is not None and deadproperties.hasProperty(prop.tag):
+            deadproperties.removeProperty(prop.tag)
+            return True
 
-        deadproperties.removeProperty(prop.tag)
-
-        return True
+        return False

Modified: z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py	2007-05-09 18:35:35 UTC (rev 75655)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py	2007-05-09 18:39:14 UTC (rev 75656)
@@ -575,9 +575,7 @@
         resource = Resource("Text Prop", 10)
 
         propp = z3c.dav.proppatch.PROPPATCH(resource, request)
-        self.assertRaises(z3c.dav.interfaces.ConflictError,
-                          propp.handleRemove,
-                          propel)
+        self.assertEqual(propp.handleRemove(propel), False)
 
     def test_event_onsetProperty(self):
         request = TestRequest(
@@ -720,9 +718,7 @@
         resource = Resource("Text Prop", 10)
 
         propp = z3c.dav.proppatch.PROPPATCH(resource, request)
-        self.assertRaises(z3c.dav.interfaces.ConflictError,
-                          propp.handleRemove,
-                          propel)
+        self.assertEqual(propp.handleRemove(propel), False)
 
     def test_remove_not_there(self):
         etree = z3c.etree.getEngine()
@@ -734,9 +730,7 @@
         resource = Resource("Text Prop", 10)
 
         propp = z3c.dav.proppatch.PROPPATCH(resource, request)
-        self.assertRaises(z3c.dav.interfaces.ConflictError,
-                          propp.handleRemove,
-                          propel)
+        self.assertEqual(propp.handleRemove(propel), False)
         self.assertEqual(self.events, [])
 
     def test_remove_prop(self):