Collector #2136: Map ResourceLockedError to the correct response code.

doc/CHANGES.txt

@@ -18,6 +18,8 @@ Zope Changes
 
     Bugs fixed
 
+      - Collector #2136: Map ResourceLockedError to the correct response code.
+
       - Collector #2016: DemoStorage couldn't wrap base storages without
                          an '_oid' attribute.
 

lib/python/ZPublisher/HTTPResponse.py

@@ -97,6 +97,7 @@ for name in en:
 status_codes['nameerror'] = 503
 status_codes['keyerror'] = 503
 status_codes['redirect'] = 300
+status_codes['resourcelockederror'] = 423
 
 
 start_of_header_search = re.compile('(<head[^>]*>)', re.IGNORECASE).search

lib/python/ZPublisher/tests/testHTTPResponse.py

@@ -74,6 +74,12 @@ class HTTPResponseTests(unittest.TestCase):
         response.appendHeader('XXX', 'foo')
         self.assertEqual(response.headers.get('xxx'), 'bar,\n\tfoo')
 
+    def test_setStatus_ResourceLockedError(self):
+        response = self._makeOne()
+        from webdav.Lockable import ResourceLockedError
+        response.setStatus(ResourceLockedError)
+        self.assertEqual(response.status, 423)
+
 
 def test_suite():
     suite = unittest.TestSuite()