summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt11
-rw-r--r--docs/api/testing.rst2
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4b2682b30..2bd2cf197 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -252,6 +252,9 @@ Backwards Incompatibilites
the responsibility of the ``repoze.bfg.includes`` ZCML to include
this file in the past; it now just doesn't.
+- The ``repoze.bfg.testing.zcml_configure`` API was removed. Use
+ the ``Configurator.load_zcml`` API instead.
+
Deprecations
------------
@@ -261,6 +264,14 @@ Deprecations
``repoze.bfg.configuration.Configurator`` class is now the preferred
way to generate a WSGI application.
+ Note that ``make_app`` calls
+ ``zope.component.getSiteManager.sethook(
+ repoze.bfg.threadlocal.get_current_registry)`` on the caller's
+ behalf, hooking ZCA global API lookups, for backwards compatibility
+ purposes. If you disuse ``make_app``, your calling code will need
+ to perform this call itself, at least if your application uses the
+ ZCA global API (``getSiteManager``, ``getAdapter``, etc).
+
Dependencies
------------
diff --git a/docs/api/testing.rst b/docs/api/testing.rst
index e0df091bc..d95f5ba63 100644
--- a/docs/api/testing.rst
+++ b/docs/api/testing.rst
@@ -35,8 +35,6 @@
.. autofunction:: cleanUp
- .. autofunction:: zcml_configure
-
.. autoclass:: DummyModel
:members: