diff --git a/CHANGES.rst b/CHANGES.rst index 4635cb53a1..34ccefd9d3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -70,20 +70,24 @@ Features Added - Updated distributions: - - AccessControl = 3.0.11 - - Acquisition = 4.0.3 + - AccessControl = 3.0.12 + - Acquisition = 4.2.2 - BTrees = 4.0.8 - DateTime = 4.0.1 - - ExtensionClass = 4.1a1 + - ExtensionClass = 4.1.2 - docutils = 0.9.1 - manuel = 1.6.0 - Missing = 3.0 + - MultiMapping = 3.0 - Persistence = 3.0a1 - Products.ExternalMethod = 2.13.1 - Products.MailHost = 2.13.2 - Products.ZCatalog = 3.1 - Record = 3.0 - - ZopeUndo = 4.0 + - tempstorage = 3.0 + - zExceptions = 3.0 + - zLOG = 3.0 + - ZopeUndo = 4.1 Restructuring +++++++++++++ diff --git a/buildout.cfg b/buildout.cfg index 90c8cc091a..0eea15e32e 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -28,8 +28,6 @@ auto-checkout = Products.ExternalMethod Products.ZCatalog Products.ZCTextIndex - tempstorage - zLOG [test] diff --git a/src/Zope2/App/tests/testExceptionHook.py b/src/Zope2/App/tests/testExceptionHook.py index 6222e433d8..efa72cf97f 100644 --- a/src/Zope2/App/tests/testExceptionHook.py +++ b/src/Zope2/App/tests/testExceptionHook.py @@ -117,13 +117,13 @@ class ExceptionHookTest(ExceptionHookTestCase): def testSystemExit(self): def f(): - raise SystemExit, 1 + raise SystemExit(1) self.assertRaises(SystemExit, self.call, None, None, f) def testUnauthorized(self): from AccessControl import Unauthorized def f(): - raise Unauthorized, 1 + raise Unauthorized('1') self.assertRaises(Unauthorized, self.call, None, {}, f) def testConflictErrorRaisesRetry(self): @@ -131,7 +131,7 @@ def testConflictErrorRaisesRetry(self): from ZODB.POSException import ConflictError from App.config import getConfiguration def f(): - raise ConflictError + raise ConflictError() request = self._makeRequest() old_value = getattr(getConfiguration(), 'conflict_error_log_level', 0) self.assertEquals(old_value, 0) # default value @@ -146,7 +146,7 @@ def f(): def testConflictErrorCount(self): from ZODB.POSException import ConflictError def f(): - raise ConflictError + raise ConflictError() hook = self._makeOne() self.assertEquals(hook.conflict_errors, 0) self.call_no_exc(hook, None, None, f) @@ -160,7 +160,7 @@ class CustomException(Exception): pass def f(): try: - raise CustomException, 'Zope' + raise CustomException('Zope') except: raise Retry(sys.exc_info()[0], sys.exc_info()[1], @@ -172,7 +172,7 @@ def testRetryRaisesConflictError(self): from ZODB.POSException import ConflictError def f(): try: - raise ConflictError + raise ConflictError() except: raise Retry(sys.exc_info()[0], sys.exc_info()[1], @@ -184,7 +184,7 @@ def testRetryUnresolvedConflictErrorCount(self): from ZODB.POSException import ConflictError def f(): try: - raise ConflictError + raise ConflictError() except: raise Retry(sys.exc_info()[0], sys.exc_info()[1], @@ -215,14 +215,14 @@ def raise_standardErrorMessage(self, c, r, t, v, tb, error_log_url): class BrokenClient(Client): def raise_standardErrorMessage(self, c, r, t, v, tb, error_log_url): - raise AttributeError, 'ouch' + raise AttributeError('ouch') class ExceptionMessageRenderTest(ExceptionHookTestCase): def testRenderUnauthorizedStandardClient(self): from AccessControl import Unauthorized def f(): - raise Unauthorized, 1 + raise Unauthorized('1') request = self._makeRequest() client = StandardClient() self.call(client, request, f) @@ -233,7 +233,7 @@ def f(): def testRenderUnauthorizedStandardClientMethod(self): from AccessControl import Unauthorized def f(): - raise Unauthorized, 1 + raise Unauthorized('1') request = self._makeRequest() client = StandardClient() self.call(client.dummyMethod, request, f) @@ -244,7 +244,7 @@ def f(): def testRenderUnauthorizedBrokenClient(self): from AccessControl import Unauthorized def f(): - raise Unauthorized, 1 + raise Unauthorized('1') request = self._makeRequest() client = BrokenClient() self.assertRaises(AttributeError, self.call, client, request, f) @@ -255,7 +255,7 @@ class CustomException(Exception): pass def f(): try: - raise CustomException, 'Zope' + raise CustomException('Zope') except: raise Retry(sys.exc_info()[0], sys.exc_info()[1], @@ -272,7 +272,7 @@ def testRenderRetryRaisesConflictError(self): from ZODB.POSException import ConflictError def f(): try: - raise ConflictError + raise ConflictError() except: raise Retry(sys.exc_info()[0], sys.exc_info()[1], @@ -313,7 +313,7 @@ def testCustomExceptionViewUnauthorized(self): from AccessControl import Unauthorized registerExceptionView(IUnauthorized) def f(): - raise Unauthorized, 1 + raise Unauthorized('1') request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) @@ -326,7 +326,7 @@ def testCustomExceptionViewForbidden(self): from zExceptions import Forbidden registerExceptionView(IForbidden) def f(): - raise Forbidden, "argh" + raise Forbidden("argh") request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) @@ -339,7 +339,7 @@ def testCustomExceptionViewNotFound(self): from zExceptions import NotFound registerExceptionView(INotFound) def f(): - raise NotFound, "argh" + raise NotFound("argh") request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) @@ -352,7 +352,7 @@ def testCustomExceptionViewBadRequest(self): from zExceptions import BadRequest registerExceptionView(IException) def f(): - raise BadRequest, "argh" + raise BadRequest("argh") request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) @@ -365,7 +365,7 @@ def testCustomExceptionViewInternalError(self): from zExceptions import InternalError registerExceptionView(IException) def f(): - raise InternalError, "argh" + raise InternalError("argh") request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) @@ -377,7 +377,7 @@ def testRedirectNoExceptionView(self): from zExceptions import Redirect registerExceptionView(IException) def f(): - raise Redirect, "http://zope.org/" + raise Redirect("http://zope.org/") request = self._makeRequest() client = StandardClient() v = self.call_exc_value(client, request, f) diff --git a/versions.cfg b/versions.cfg index 42931c9c63..edf850dbcd 100644 --- a/versions.cfg +++ b/versions.cfg @@ -12,17 +12,17 @@ DocumentTemplate = 2.13.2 ExtensionClass = 4.1.2 initgroups = 2.13.0 Missing = 3.0 -MultiMapping = 2.13.0 +MultiMapping = 3.0 nt-svcutils = 2.13.0 Persistence = 3.0a1 Products.OFSP = 2.13.2 Products.ZCatalog = 3.1 Products.ZCTextIndex = 2.13.5 Record = 3.0 -tempstorage = 2.12.2 -zExceptions = 2.13.0 -zLOG = 2.12.0 -ZopeUndo = 4.0 +tempstorage = 3.0 +zExceptions = 3.0 +zLOG = 3.0 +ZopeUndo = 4.1 # Deprecated / CMF dependencies Products.BTreeFolder2 = 2.14.0