summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-11-04 12:01:38 -0600
committerMichael Merickel <michael@merickel.org>2012-11-04 12:01:38 -0600
commit531e9ac9b45889322d80b46d661c6c3059fef2c7 (patch)
treed8c8fe6e2bec42ed86b5830b11d159f200d6f1dd
parent19b8207ff1e959669d296407ed112545364a495d (diff)
parentca4656877ab909b88ee1730cab611c8007ff7a39 (diff)
downloadpyramid-531e9ac9b45889322d80b46d661c6c3059fef2c7.tar.gz
pyramid-531e9ac9b45889322d80b46d661c6c3059fef2c7.tar.bz2
pyramid-531e9ac9b45889322d80b46d661c6c3059fef2c7.zip
Merge branch 'master' into fix.695
-rw-r--r--CHANGES.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 390d3c3e3..b3733a787 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,7 +18,8 @@ Features
reserved for internal usage by Pyramid and they will not be accepted as valid
userids.
-- Slightly better debug logging from RepozeWho1AuthenticationPolicy.
+- Slightly better debug logging from
+ ``pyramid.authentication.RepozeWho1AuthenticationPolicy``.
- ``pyramid.security.view_execution_permitted`` used to return `True` if no
view could be found. It now raises a ``TypeError`` exception in that case, as
@@ -53,7 +54,7 @@ Internals
- Move ``TopologicalSorter`` from ``pyramid.config.util`` to ``pyramid.util``,
move ``CyclicDependencyError`` from ``pyramid.config.util`` to
``pyramid.exceptions``, rename ``Singleton`` to ``Sentinel`` and move from
- ``pyramid.config.util`` to ``pyramid.config.util``; this is in an effort to
+ ``pyramid.config.util`` to ``pyramid.util``; this is in an effort to
move that stuff that may be an API one day out of ``pyramid.config.util``,
because that package should never be imported from non-Pyramid code.
TopologicalSorter is still not an API, but may become one.