Merge router-simplify branch. Changelog below.

Bug Fixes
---------

- Fix a bug where the Paste configuration's ``unicode_path_segments``
  (and os.environ's ``BFG_UNICODE_PATH_SEGMENTS``) may have been
  defaulting to false in some circumstances.  It now always defaults
  to true, matching the documentation and intent.

- The ``repoze.bfg.traversal.find_model`` API did not work properly
  when passed a ``path`` argument which was unicode and contained
  high-order bytes when the ``unicode_path_segments`` or
  ``BFG_UNICODE_PATH_SEGMENTS`` configuration variables were "true".

- A new module was added: ``repoze.bfg.settings``.  This contains
  deployment-settings-related code.

Behavior Changes
----------------

- The ``make_app`` callable within ``repoze.bfg.router`` now registers
  the ``root_policy`` argument as a utility (unnamed, using the new
  ``repoze.bfg.interfaces.IRootFactory`` as a provides interface)
  rather than passing it as the first argument to the
  ``repoze.bfg.router.Router`` class.  As a result the
  ``repoze.bfg.router.Router`` router class only accepts a single
  argument: ``registry``.  The ``repoze.bfg.router.Router`` class
  retrieves the root policy via a utility lookup now.  The
  ``repoze.bfg.router.make_app`` API also now performs some important
  application registrations that were previously handled inside
  ``repoze.bfg.registry.makeRegistry``.

- The ``repoze.bfg.settings.Settings`` class (an instance of which is
  registered as a utility providing
  ``repoze.bfg.interfaces.ISettings`` when any application is started)
  now automatically calls ``repoze.bfg.settings.get_options`` on the
  options passed to its constructor.  This means that usage of
  ``get_options`` within an application's ``make_app`` function is no
  longer required (the "raw" ``options`` dict or None may be passed).

Deprecations
------------

- Moved the ``repoze.bfg.registry.Settings`` class.  This has been
  moved to ``repoze.bfg.settings.Settings``. A deprecation warning is
  issued when it is imported from the older location.

- Moved the ``repoze.bfg.registry.get_options`` function This has been
  moved to ``repoze.bfg.settings.get_options``.  A deprecation warning
  is issued when it is imported from the older location.

- The ``repoze.bfg.interfaces.IRootPolicy`` interface was renamed
  within the interfaces package.  It has been renamed to
  ``IRootFactory``.  A deprecation warning is issued when it is
  imported from the older location.

1 files changed, 55 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 09d399f8d..538c7c96d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,61 @@ Features
 - Projects generated by the paster templates now use the
   ``DummyTemplateRenderer.assert_`` method in their view tests.
 
+Bug Fixes
+---------
+
+- Fix a bug where the Paste configuration's ``unicode_path_segments``
+  (and os.environ's ``BFG_UNICODE_PATH_SEGMENTS``) may have been
+  defaulting to false in some circumstances.  It now always defaults
+  to true, matching the documentation and intent.
+
+- The ``repoze.bfg.traversal.find_model`` API did not work properly
+  when passed a ``path`` argument which was unicode and contained
+  high-order bytes when the ``unicode_path_segments`` or
+  ``BFG_UNICODE_PATH_SEGMENTS`` configuration variables were "true".
+
+- A new module was added: ``repoze.bfg.settings``.  This contains
+  deployment-settings-related code.
+
+Behavior Changes
+----------------
+
+- The ``make_app`` callable within ``repoze.bfg.router`` now registers
+  the ``root_policy`` argument as a utility (unnamed, using the new
+  ``repoze.bfg.interfaces.IRootFactory`` as a provides interface)
+  rather than passing it as the first argument to the
+  ``repoze.bfg.router.Router`` class.  As a result the
+  ``repoze.bfg.router.Router`` router class only accepts a single
+  argument: ``registry``.  The ``repoze.bfg.router.Router`` class
+  retrieves the root policy via a utility lookup now.  The
+  ``repoze.bfg.router.make_app`` API also now performs some important
+  application registrations that were previously handled inside
+  ``repoze.bfg.registry.makeRegistry``.
+
+- The ``repoze.bfg.settings.Settings`` class (an instance of which is
+  registered as a utility providing
+  ``repoze.bfg.interfaces.ISettings`` when any application is started)
+  now automatically calls ``repoze.bfg.settings.get_options`` on the
+  options passed to its constructor.  This means that usage of
+  ``get_options`` within an application's ``make_app`` function is no
+  longer required (the "raw" ``options`` dict or None may be passed).
+
+Deprecations
+------------
+
+- Moved the ``repoze.bfg.registry.Settings`` class.  This has been
+  moved to ``repoze.bfg.settings.Settings``. A deprecation warning is
+  issued when it is imported from the older location.
+
+- Moved the ``repoze.bfg.registry.get_options`` function This has been
+  moved to ``repoze.bfg.settings.get_options``.  A deprecation warning
+  is issued when it is imported from the older location.
+
+- The ``repoze.bfg.interfaces.IRootPolicy`` interface was renamed
+  within the interfaces package.  It has been renamed to
+  ``IRootFactory``.  A deprecation warning is issued when it is
+  imported from the older location.
+
 0.6.1 (2009-01-06)
 ==================