summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-04 14:58:42 -0500
committerChris McDonough <chrism@plope.com>2012-11-04 14:58:42 -0500
commitdb9fbf0773dc143126589897d9b1f1d98c2dc7b0 (patch)
treea0d0fea1d6e05c7b4d69f854f145b9bc7ecd378d
parent9149461a45399a9f7f23322daa7c02e1397f9a91 (diff)
parentca4656877ab909b88ee1730cab611c8007ff7a39 (diff)
downloadpyramid-db9fbf0773dc143126589897d9b1f1d98c2dc7b0.tar.gz
pyramid-db9fbf0773dc143126589897d9b1f1d98c2dc7b0.tar.bz2
pyramid-db9fbf0773dc143126589897d9b1f1d98c2dc7b0.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--CHANGES.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 45fc19762..a9ce80712 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,7 +14,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
@@ -67,7 +68,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.